From nobody Mon Nov 16 21:00:46 2026 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 4jT0dC25P7z70wRr for ; Mon, 16 Nov 2026 21:00:47 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jT0dB5Zbpz4CRq for ; Mon, 16 Nov 2026 21:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862846; 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=GPY8Dcwoj0NaZPo5CB4AH6MVNoSSdJ7g9mLgEbEX5uk=; b=BNtD4XH1cxqxuVd9w+zsQsA8SdqWPMT5V/2JYQ/jRppoSG1IxoH1rydOof3ZO+WJ+iefve f+XzipPjOqU5Ef/STsoveBi00k9Vx9cmDGgMHQwsJtIIpm2cqmpkjm/vWftFy3UFfyipQP dx0X6m/JJa4J+S5IQ5ngJ9t2iiJ47Z/5aLUB/NCll0izTXItiKvGjQtENSVOUN4WOQ9635 b9YdW//JnNJsl+Grwg35OBI7Yi209vKODsioL1Jlocss6+vSVwdfSrL6k7w7o0XpXdx3Ju 8OYSWDW0OysF8tRlBhS2XdElC6ZXKUnKHBG9pr7SgmjztQz8Ra0R7SMkLjRvQQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794862846; b=HJz6UuE2PyTBIIMY+LiEL3Wof8LhKIrZriqrJPCOLSBbriC/3BHn8aj0yGqX+Ut2tA1Ayl UhP70JtLfyo6nCaKLN9b0i8p5FNsM2sdYcJ+5pxc64ClvvXGShB8Q9XZmHKNfBwNx/6LmE pggzIf9r3MsAOwAKVmJq1qKD9OtYnJKnnwOH0nVu1sbsG6QfS9RTsQXGydkibVaWvissq4 O48YGDPRy4vEf88zrG7ZCN/94qV6MnLYwM82PO4YOKA0Hum88B7XoleFgMAshMxofy5Nax 0AX6CdaDvcjVFEksEvRoIKX6rReqFL+a6QYlHeNSw1oNrbBdF/ehuGYuM37KNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862846; 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=GPY8Dcwoj0NaZPo5CB4AH6MVNoSSdJ7g9mLgEbEX5uk=; b=WpC3F5jLcUroBAvIMLoVbnd5Tv54kXrN8vC5kKJEWYjhIIa7QG8ylMXnbaIPq7nGasspCq XmyhJ4bSh3VpWSvps0kiqHScJW0hDfRHzIUjCzhtWhFGJSHaNA0nUeL5scq6+Iq2TGv6VN qZUdm7aGZ5pGBZbMfSdH4FVZ70th4XDwulBgOlhJtQdqHi0ux1BtuUmNesMil4BH78hfBu xO0QV3iClcRW+C8vYFDPy2EGLvpmrfG7jxkOu5vCitFYr8FNl1WSZthQ00zwb9YTlxTyMj iq+mgeQ7eROPWX77IN4Y4fna5Bd0/7NN14emuETAVWGZRP7ps/UhauRGO3q/3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jT0dB58YMz19Z3 for ; Mon, 16 Nov 2026 21:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 93ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 21:00:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: 88b41e5eb429 - stable/15 - camcontrol: Don't close the CAM device in nvme_get_data() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ken X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 88b41e5eb42926013d374e4b9736f69cf3eed9f2 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 21:00:46 +0000 Message-Id: <6afb6efe.93ef.5a5d9703@gitrepo.freebsd.org> The branch stable/15 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=88b41e5eb42926013d374e4b9736f69cf3eed9f2 commit 88b41e5eb42926013d374e4b9736f69cf3eed9f2 Author: Kenneth D. Merry AuthorDate: 2026-11-09 18:47:01 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-16 16:12:49 +0000 camcontrol: Don't close the CAM device in nvme_get_data() nvme_get_data() closed the supplied CAM device on every error path, but its callers either pass the device that main() opened and closes, or close the device themselves, so an error resulted in a double cam_close_device() and a double free. Move the error path close into print_dev_nvme(), the one caller that opens its own device, and leave the device alone in nvme_get_data(). This predates the recent camcontrol NVMe additions, but they added more callers. Reported by: llm-postcr Fixes: 6ee13c54dad0 MFC after: 1 week Sponsored by: Spectra Logic Co-authored-by: Claude Fable 5 (cherry picked from commit f7c24ef1e9a47b889eaaae8514c61e95d9738cf8) --- sbin/camcontrol/camcontrol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 28a2d39606a6..8a93206a3d7a 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -813,7 +813,6 @@ nvme_get_data(struct cam_device *dev, int nvme_data_type, void *data, ccb = cam_getccb(dev); if (ccb == NULL) { warnx("couldn't allocate CCB"); - cam_close_device(dev); return (1); } @@ -840,7 +839,6 @@ nvme_get_data(struct cam_device *dev, int nvme_data_type, void *data, return 0; bailout_error: - cam_close_device(dev); return (1); } @@ -858,8 +856,10 @@ print_dev_nvme(struct device_match_result *dev_result, char *tmpstr) return (1); } - if (nvme_get_data(dev, CDAI_TYPE_NVME_CNTRL, &cdata, sizeof(cdata))) + if (nvme_get_data(dev, CDAI_TYPE_NVME_CNTRL, &cdata, sizeof(cdata))) { + cam_close_device(dev); return (1); + } cam_strvis(vendor, cdata.mn, sizeof(cdata.mn), sizeof(vendor)); cam_strvis(product, cdata.fr, sizeof(cdata.fr), sizeof(product));