From nobody Fri Oct 21 23:44:22 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MvLfG6yfnz4g1Z5; Fri, 21 Oct 2022 23:44:22 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MvLfG68xyz3j90; Fri, 21 Oct 2022 23:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666395862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MdqrIqxfQRMa655ECtIIFru8jaAm/b4OyyFK+ZyVdQE=; b=AXvxt9tPC4gySyoZYTeYbYOT0HLrWDC0sfB2AVwDz4a9YkrD0z2C9PmuG9KE5wREbEOKAp XI6S5EXDsfzJH9n76K7xiVyIY/dcW1+IGWXthtelbb/X4joTe3mtDAFFK8Hfglt/gVAtwA 3R8xQmh/4Olnsd6N3J3fX/KOnHazsejqCkJt6AvJsf9yGMKJX3X9sivBEWwqAZdZkZrtus hRLuO1yj7W1yTJuj9F9wpOeddjmY8s/X/mTr2122WwduR3PuLWPMeovkCsFI/iRNSd3/NC Y9qZLe4EO4sHl9S5BHNKiXaRh+eivP7B1D7f8KerntyIUv51SnSEbaagjFCaiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MvLfG5BypzMtv; Fri, 21 Oct 2022 23:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29LNiMnB029542; Fri, 21 Oct 2022 23:44:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29LNiMAX029541; Fri, 21 Oct 2022 23:44:22 GMT (envelope-from git) Date: Fri, 21 Oct 2022 23:44:22 GMT Message-Id: <202210212344.29LNiMAX029541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 787df454c817 - main - stabd/geli: Bail out if you can't get the disks size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 787df454c8175e58131f582c05c169070fb6ca7c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666395862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MdqrIqxfQRMa655ECtIIFru8jaAm/b4OyyFK+ZyVdQE=; b=hVRMVg8wRokrKWxan84/9tZRXoAmxyHLRmf32O41/2uxTjG7W2fngoVDIgZlhPq3WOKGHs nc1t2KQcEVk/aFPcaf51405oumQB3/MxRhKD88UOBuZhMsv/WmxHBIJsLBgasZdlLq93lg zU6E3sZJRGnNsrVIn9M0zmXfPxNbHQJPArAmnr8w7Ipg+tsd5oOk6J6GOttdLfnLwkoKa8 KT9RYUOMivwIl2t3iIp8akKxVNYDhri5pg6jgIntc17JobKB/2x3cK0Fs7VM5QuBhnbitf sCZAl+4n36b0VhdjDvkqEPc09mBDrddGAREqG6CTJUAZrg8q7oXXzg3SJiz6kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666395862; a=rsa-sha256; cv=none; b=XuoC50/aFTk+s8hEmXbkOgr0NflQvkwO8xJ7VAldAQIh4xtevkGSpJANxyNtXcT6Y3B10n D4+sqTCBtdfG7dWFc5E5OIyflPSEqPcvHE9Gd184z8WgsPYyDhg7CgyhIWqZBQJl/2uG+U yfMT0tOeRJ2iMd2OBk943a+NG+UlJY07TYOC56Ocw1A7xh2tg1WUd+x9C6adoFgxhpQ4VJ F+t4S5RLcw9m9gAoSf/ajJlGl8rpga65jXX8tQIMC7yvI7Wr7KBsxZEd6tm02hJciA6rSp 9fUL519BnojhLUiAFB9o6dE7Q1Yl765I4mSdULffPBjEYGd6sZXJg/9TnyPzTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=787df454c8175e58131f582c05c169070fb6ca7c commit 787df454c8175e58131f582c05c169070fb6ca7c Author: Warner Losh AuthorDate: 2022-10-21 23:39:34 +0000 Commit: Warner Losh CommitDate: 2022-10-21 23:39:34 +0000 stabd/geli: Bail out if you can't get the disks size If the DIOCGMEDIASIZE ioctl fails, assume the disk doesn't have geli encryption. While all disks should implement this, fail safe for disks / partitions that do not. Sponsored by: Netflix --- stand/libsa/geli/gelidev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/libsa/geli/gelidev.c b/stand/libsa/geli/gelidev.c index 5f1143399fb3..2dd686c81883 100644 --- a/stand/libsa/geli/gelidev.c +++ b/stand/libsa/geli/gelidev.c @@ -302,7 +302,8 @@ geli_probe_and_attach(struct open_file *f) hdesc = (struct disk_devdesc *)(f->f_devdata); /* Get the last block number for the host provider. */ - hdesc->dd.d_dev->dv_ioctl(f, DIOCGMEDIASIZE, &hmediasize); + if (hdesc->dd.d_dev->dv_ioctl(f, DIOCGMEDIASIZE, &hmediasize) != 0) + return; hlastblk = (hmediasize / DEV_BSIZE) - 1; /* Taste the host provider. If it's not geli-encrypted just return. */