From owner-svn-src-all@freebsd.org  Tue Jul  7 12:24:40 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id DEA793614C5;
 Tue,  7 Jul 2020 12:24:40 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4B1M7r5cQZz4X2h;
 Tue,  7 Jul 2020 12:24:40 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A074EF35A;
 Tue,  7 Jul 2020 12:24:40 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 067COerU025030;
 Tue, 7 Jul 2020 12:24:40 GMT (envelope-from tsoome@FreeBSD.org)
Received: (from tsoome@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 067COe7F025029;
 Tue, 7 Jul 2020 12:24:40 GMT (envelope-from tsoome@FreeBSD.org)
Message-Id: <202007071224.067COe7F025029@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tsoome set sender to
 tsoome@FreeBSD.org using -f
From: Toomas Soome <tsoome@FreeBSD.org>
Date: Tue, 7 Jul 2020 12:24:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r362989 - head/stand/libsa/geli
X-SVN-Group: head
X-SVN-Commit-Author: tsoome
X-SVN-Commit-Paths: head/stand/libsa/geli
X-SVN-Commit-Revision: 362989
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jul 2020 12:24:40 -0000

Author: tsoome
Date: Tue Jul  7 12:24:40 2020
New Revision: 362989
URL: https://svnweb.freebsd.org/changeset/base/362989

Log:
  loader: geli_dev_ioctl does return huge mediasize
  
  The DIOCGMEDIASIZE is calculated md->md_sectorsize * md->md_provsize, and
  for boot disk, the md_sectorsize is 4k. However, the md_provsize is already
  in units of bytes.
  
  Sponsored by:	Netflix, Klara Inc.

Modified:
  head/stand/libsa/geli/gelidev.c

Modified: head/stand/libsa/geli/gelidev.c
==============================================================================
--- head/stand/libsa/geli/gelidev.c	Tue Jul  7 12:10:59 2020	(r362988)
+++ head/stand/libsa/geli/gelidev.c	Tue Jul  7 12:24:40 2020	(r362989)
@@ -219,7 +219,7 @@ geli_dev_ioctl(struct open_file *f, u_long cmd, void *
 		*(u_int *)data = md->md_sectorsize;
 		break;
 	case DIOCGMEDIASIZE:
-		*(uint64_t *)data = md->md_sectorsize * md->md_provsize;
+		*(uint64_t *)data = md->md_provsize;
 		break;
 	default:
 		return (ENOTTY);