From nobody Mon Nov 09 19:14:14 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 4jNfbW0f1xz70LGn for ; Mon, 09 Nov 2026 19:14:15 +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 4jNfbV6YRMz4TWQ for ; Mon, 09 Nov 2026 19:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794251654; 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=8FobJv5HYI0wSK56IArb0uV4f8X7cv0ER38k8d/OZbs=; b=h+dnE+SdR7msHpg+Ws59YT9c6Y3SNHKj7Dai0LXNitB9K3k0T1J3tOFrJnduht0LFm6spD bqSi/oHmzIQp4ZErTHHJXg04XHcfFQMsT0QILg1eOJ/wNHKcYcjnbVtIKEu8c6FZycbOxW kA5pJUm5AKUDOO7FNIA/52ZSR3n2H+IFAR4bDLpXOOLWrqN/c9ow/vfpWKw3ExZ6qcD8DN 6+XFI1adM8jRukUjNkvsx86sxJsmKG6om0kEBCRQItvKAdzx3iHNKDiD/HxtjgEGQZVhOa Xw5Dfb0WgHiI9lKhmLt5V9fcj8h+SsslhLpOqhPtE5/PhdFiagyQg2p4a3H+rQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794251654; b=qhl6K2WVz2umdiSs1byq4WPc8RjByoCHuZjcdCCvcL1wPml6EHYbKAUR17Nktc/Xs3x/nJ ME1VWZHiKcmx42soOnEG/q99gGf7Ea5U4zugCnTbqir5rX+f+ZNQghVEgICszrQnzFo02U sNy694mIHF4tiepoFJsbkiKX2YoTNvxBtkOPh2OazWYcVO0NdQd3haPMnAgDMpb6b5D5Kw AkTmhbS26jr2VS1i2ZpAeRLWlWBkRhXAI/FbYVRKnZKiDZEavBGLX4ukUd7f05dR2i70ud RebznQdq6NzsHPuWLq9rDCz8xlKm5Cata6FtL9PFbW9J/+UlyMFeNN9ROfTf2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794251654; 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=8FobJv5HYI0wSK56IArb0uV4f8X7cv0ER38k8d/OZbs=; b=iRAZTAHh2QVt7L47d46sisJC+sXf7A2UKr2sUacQvM2+VuD7blzYnUlq8q2ovxMV0vfG1l PSIFvLyBKoWhkj5btFYV5n8ePXrb6ILHNqpH/WBo1q78XR8r6l4XbgemzM8wIvWWkZ1c8u 23AiId87NAe89yNE4CED4jqy90uyapAB0L6UTO8/4RiSkwMlEIHlR7l4Y7JMFUrZvnW5Hc pgdnO35RmwtAuIidC/fTAKO3NDit0DE8LcBW8ogTa5wJwr0uFcMmHtScWPiCxWHDEr520F tNyjnSQZgUk0Fz/jt8haEUr4m8XRfEjuR/7/AH3tFCT52fIx4N/ziRYzRWNX+A== 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 4jNfbV5y08zv60 for ; Mon, 09 Nov 2026 19:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d641 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 19:14:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kenneth D. Merry Subject: git: f7c24ef1e9a4 - main - 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 Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: f7c24ef1e9a47b889eaaae8514c61e95d9738cf8 Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 19:14:14 +0000 Message-Id: <6af21b86.d641.6dbbf8c8@gitrepo.freebsd.org> The branch main has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c24ef1e9a47b889eaaae8514c61e95d9738cf8 commit f7c24ef1e9a47b889eaaae8514c61e95d9738cf8 Author: Kenneth D. Merry AuthorDate: 2026-11-09 18:47:01 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-09 18:59:13 +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 --- 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));