From nobody Tue Jan 24 22:12:51 2023 X-Original-To: dev-commits-src-branches@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 4P1h6r2yq5z3bgHX; Tue, 24 Jan 2023 22:12:52 +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 4P1h6q66gqz3Dv1; Tue, 24 Jan 2023 22:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598371; 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=PklSYAhTQwCuE9GaUdqiFJ2JV/1v1n1Xh2yXzeIHhe0=; b=QJXi5eGtzuKVRHJ7Fsd+bAQ4Z0GrOCeP6ugPlovaXHXqQo4iUE8T16j5WBauW/TcshbGu1 5A677nzTGpyHEqU3/4qa4Ya6cSlH7iYZTPNdnZ/RFYPgHdlS1gZ3H/5JicdwM+O4jMOcaa SrcS4NMRprYmydZpuwNbhRAowVxiWlZqfyap4DRHA00boGmPdGM+38tcdyJnNMQFwcKhF/ RQw5jPbdLVvp5iEmbhuG+EBeHTbb73zYQ1kie8jwWKsl13sYyAY3ZhmXA7MNB5RckUJzrU X2jFFjjgkXuGPqbZfZ/F2aEweG29deEyvgqva4f4tZ7S4sEqm8e+70+0WSu5Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598371; 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=PklSYAhTQwCuE9GaUdqiFJ2JV/1v1n1Xh2yXzeIHhe0=; b=jb6pmjUARLrtt3qmyJziiMP97UWZs8RZ79jbcC4PysxkSMshZz3FL7AITMjhazKmSzi16O BFtQWMCm16FDWmgdHG7fDSnKAOFVSvqFhYWad34begvrmAoCWtsPYKne/C2khLkjZLBeOJ 1LBRFcYIE7BoI6C7RSUJsVMEqAFxuRUAh2qK3JmyZIW8r/SvpfjNJ0DEQqLzRZSnf3bzzR BtcqmEVq9qRkPQTRcEW726oIZTC7pVvxNuSwTuS3UzyBp+YXDxXomnUn2035b2mhUD8GyK zX08ZCGY/9/BVeVHJ9UcADcwwMIyBL23lD/NMXqr/4YjPa4ry2SASJd06BF7Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598371; a=rsa-sha256; cv=none; b=WYRvVVV2hkqcm4FfeNVUug9cxdUmLIJAhLEz2Vn2w2dSktY4M9UGvnPZrYeDBOqoOYZJJN PmgDMw/WepKW863+KObkUgQOOl3uphryJBVgYxj/9vHDkoIorydT4EKT7hFUxU5meGITqw VaHe5Vq7dZnRzQpbMO/xSkXywttP2IRO8RPfEy7a6O3d2ctcfxv5BTT/E2/AE7pmvjP5JE buMlsDNr+f04P0tAowDe9r/LbusUvm9xzmNJDkhPbG2cge6R6X0JtElhElR2HOcahyc4N3 /uzADrJV3Qd7TYu9dGbp5GIoqZNQd+IquaLomMftqfL7LkdcIFtYCXyALkHGZQ== 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 4P1h6q5DFnzQVj; Tue, 24 Jan 2023 22:12:51 +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 30OMCpCj087619; Tue, 24 Jan 2023 22:12:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMCplX087618; Tue, 24 Jan 2023 22:12:51 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:51 GMT Message-Id: <202301242212.30OMCplX087618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e2cc4bab4b00 - stable/13 - stabd/geli: Bail out if you can't get the disks size List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: e2cc4bab4b001e419557c9692a918b29dd35e1e8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e2cc4bab4b001e419557c9692a918b29dd35e1e8 commit e2cc4bab4b001e419557c9692a918b29dd35e1e8 Author: Warner Losh AuthorDate: 2022-10-21 23:39:34 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:36 +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 (cherry picked from commit 787df454c8175e58131f582c05c169070fb6ca7c) --- 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. */