From nobody Mon Sep 4 12:55:35 2023 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 4RfTBv3Qnlz4sb1V; Mon, 4 Sep 2023 12:55:35 +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 4RfTBv2yRtz4Jn0; Mon, 4 Sep 2023 12:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693832135; 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=Iei80lsxgfV+fe6c+3OFsoIpPHXlJA7IsO304mnoiBg=; b=Bmie3GOG/9IFWwxewMcLLp6kkSMGeCShENkpYZ+5mtvMFzw5cWNHhUy/AQ0qfY566KfDR5 4jQPmTlvghCaQ0CC2DsLH1tPJgWCfGbtKin0tjLWA5avDIjlCRPKnTLk0haeCUdSq5uw52 heV6TsUpdh2lyGZqUD5ggifUmDexx8C5C+EeRL8J7BzEWodm58iZEvfHOhiw7yHvnJzhTN xnVSVT+QKolVeXar2M6PtQAbmvuqjUAORQPtWZkH6+Vk2RvezNs4wtUCKFXGTiZCJyh79Y +uB4MEidPR6QUXV/cT0KdnegFFl/UY4QWFE4Ox7qBZFI0g4oJtwy879DDAd5RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693832135; a=rsa-sha256; cv=none; b=pg/uRfX34L/ZF6f+ikTb+ZDOSo5zdQ19pf6DIDa+kRluk2LbkKWROW5w+FJwdMI1pVHCdk o/sVQtBRqMdcWpN0RLoo7qa78tuY70SWsnfSMOh5teoG89rPxEo6Z+uzRNgrC38jZ4Hi5l F4rP42pS9k3CAIZulZHc/CBNMElDJnsc1dM6q9aqf0w76POTt1plpJiy7cxbo0xP8/YvsG eilMFK7QOsLDTIQwXdQ4qiHwSdFvKpGon54BWsO/Cdk7JNtfNkjf+S4HC7P850OADGniOo 0Ip8JrZXMKmb9mMvsl3bB4pQgR/1HGst6Jw1372lMef0sdh0+ztShwzw10Yd6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693832135; 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=Iei80lsxgfV+fe6c+3OFsoIpPHXlJA7IsO304mnoiBg=; b=pZizhU4e7plcViZF5R/NnelahDcJAf6+FzIyVXUX4BTE9GRhFuaqYTgUHDqOZzv57P0PEQ FwXhUbnXo9wbSy1LiSI9cuPY+vCnK1jxMi+olfBomtWZ7bRr0lSPXAMYVh49W3939kMMGz xFzML2jVu5GMCiDAcJ9Qj/vTm2dKSXQYf97LTakz4fuFoJ1GcGjrom3RK+MUOsZgalwE0g apSYzLPNJfMJ4zCnrcktlvC4+dvx77spiXebY+SACqq9Fk9yunr+h9eAZPOxqQtjddIutK vEyR3WlJD/6VA1ZAa2zIN3Lcl2P0VzoRxtDI5uH4pOLN5LtJNC5M47jgNl64RA== 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 4RfTBv1vhbz16NC; Mon, 4 Sep 2023 12:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384CtZSl032836; Mon, 4 Sep 2023 12:55:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384CtZQB032833; Mon, 4 Sep 2023 12:55:35 GMT (envelope-from git) Date: Mon, 4 Sep 2023 12:55:35 GMT Message-Id: <202309041255.384CtZQB032833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b785ac18c7d3 - stable/13 - geli: Fix geli setkey -J for detached providers 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b785ac18c7d36cfa84ce8ff8705dc10edd7d2013 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b785ac18c7d36cfa84ce8ff8705dc10edd7d2013 commit b785ac18c7d36cfa84ce8ff8705dc10edd7d2013 Author: Arjan de Vet AuthorDate: 2023-08-28 14:54:18 +0000 Commit: Mark Johnston CommitDate: 2023-09-04 12:55:15 +0000 geli: Fix geli setkey -J for detached providers Clear cached_passphrase before generating a new key, otherwise the operation nonsensically tries to reuse the old passphrase. PR: 254966 Pull Request: https://github.com/freebsd/freebsd-src/pull/780 MFC after: 1 week (cherry picked from commit 88d13bf33754bd4b0c5df92eef83d6fadb9b4944) --- lib/geom/eli/geom_eli.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/geom/eli/geom_eli.c b/lib/geom/eli/geom_eli.c index 6cbb23230fa5..1efb760830c4 100644 --- a/lib/geom/eli/geom_eli.c +++ b/lib/geom/eli/geom_eli.c @@ -1421,6 +1421,12 @@ eli_setkey_detached(struct gctl_req *req, const char *prov, bcopy(mkey, mkeydst, sizeof(mkey)); explicit_bzero(mkey, sizeof(mkey)); + /* + * The previous eli_genkey() set cached_passphrase, we do not want to + * use that for the new passphrase so always prompt for it + */ + explicit_bzero(cached_passphrase, sizeof(cached_passphrase)); + /* Generate key for Master Key encryption. */ if (eli_genkey_single(req, md, key, true) == NULL) { explicit_bzero(key, sizeof(key));