From nobody Wed Sep 04 19:58:24 2024 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 4WzYFr1tjCz5VHF6; Wed, 04 Sep 2024 19:58:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzYFr1HcZz49Tm; Wed, 4 Sep 2024 19:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725479904; 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=BHQ5xyZMsxroWYqXAtd9bme7wz3qQ4M1GNq0IdgeETQ=; b=DOaYVRkyCQvgbCDs/bx23DP0WwFSiBhkeyQD2DJOlqCSdnYa4HgKSdLDNnstE62kCq5HMY 7dRU3QBSp251WhcimAdF8gQHwqueXV5/28BZxCpTWL3Fkhd8FbjU+A2oOlqpRbDuCi8W1l eIfm2RrrBB/yGB7UvsTV3sLA/V0rrjrhr+B/ZF9+9Wxcpu6gB7h3uNA4AEiPH2Z0djQFpp KmywAUa8BQ/StVKbwqsHbHx0creBVGimjTBGCgBzeJ1ezGRrMx3FgnmbCd9FzBSQiop9pf Ms7HAa+9IFCwq2IF9sb6eaBA15rBx4IJlbbdoi07A2nzBSKTvIgahGI+DZeDaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725479904; a=rsa-sha256; cv=none; b=KvWDeK5fzwFuaxWZ72/Fhx3k/TZ8kpv+I8blGg5XNJHOmQ2fGchAMzSP9dEuKx47HuM3R3 3v7FIbhPN8DqL2UQB7/ikiIf6KBH/DzeoGWyonV6zAVefnbh1Y8OAHhF0LlWSQtR+lRvh3 hj9fLZA2afB1itQWgJ9IE54d7tppgxYkrPokcnXbIknChzchLbO5+BvVVPQ8bwZax4JwgS MjKN5hwLZjhK5YaVdw1DjGVUNVgIhBNhKy5oiHNtHeI6yixqxfHTwPd9shVGFPyU9djaCd +S6G9IH9whvwrTd2je/5YMZfYPST0iCjcOsiVo6Wg0nUx3tLTTrYPIICeFu1/w== 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=1725479904; 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=BHQ5xyZMsxroWYqXAtd9bme7wz3qQ4M1GNq0IdgeETQ=; b=qrcL/N3+nRMZ93ZRjCBprpeiOvJICEuDUOZKVjk1yC/KccOsHUN+A4vtjjc7R36F685le6 37D7pb/HAdOiVnm/YZYlPEIt+02XIiiukfxodAWQdXmijMw6XTIwnP8ansMe18gY8Brgl6 7HZHSHfCD54zKhxiziAYbu2VG2So7FV3eFKxS/yb80SMU7WYzMNXNVn73VYiLha9HqSX6I Rz6ptASX4D9mZEhx3RLuajVc9Qhmr4UT74ljRmhlox3roNosZnP3FOiIV7u7CyCqw9yLQr P6mTCz6oSlwk5ux3CVxNJsdEH2THeva6pXDr9+3WJoFbdvQpNzR1QOBOImlb6A== 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 4WzYFr0tdZzf0V; Wed, 4 Sep 2024 19:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484JwOf1029993; Wed, 4 Sep 2024 19:58:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484JwOda029990; Wed, 4 Sep 2024 19:58:24 GMT (envelope-from git) Date: Wed, 4 Sep 2024 19:58:24 GMT Message-Id: <202409041958.484JwOda029990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 98e8cb3d94ce - releng/13.4 - ctl: fix memory disclosure in read/write buffer commands 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: 98e8cb3d94ce4a41e5bb290f257f790d9e090bb3 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=98e8cb3d94ce4a41e5bb290f257f790d9e090bb3 commit 98e8cb3d94ce4a41e5bb290f257f790d9e090bb3 Author: Pierre Pronchery AuthorDate: 2024-09-04 14:38:11 +0000 Commit: Ed Maste CommitDate: 2024-09-04 19:14:14 +0000 ctl: fix memory disclosure in read/write buffer commands The functions ctl_write_buffer() and ctl_read_buffer() are vulnerable to a kernel memory disclosure caused by an uninitialized kernel allocation. If one of these functions is called for the first time for a given LUN, a kernel allocation is performed without the M_ZERO flag. Then a call to ctl_read_buffer() returns the content of this allocation, which may contain kernel data. Reported by: Synacktiv Reviewed by: asomers Reviewed by: jhb Security: FreeBSD-SA-24:11.ctl Security: CVE-2024-8178 Security: HYP-05 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45952 (cherry picked from commit ea44766b78d639d3a89afd5302ec6feffaade813) (cherry picked from commit cdfdb3b0086268cdc365174ebfb69e66b5dde0b5) (cherry picked from commit b13631a59f2a303418c0f3f298b33f2a51fa59a7) Approved by: so Approved by: re (cperciva) --- sys/cam/ctl/ctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 5635246845b9..f9fec62249cb 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -5633,7 +5633,7 @@ ctl_read_buffer(struct ctl_scsiio *ctsio) } else { if (lun->write_buffer == NULL) { lun->write_buffer = malloc(CTL_WRITE_BUFFER_SIZE, - M_CTL, M_WAITOK); + M_CTL, M_WAITOK | M_ZERO); } ctsio->kern_data_ptr = lun->write_buffer + buffer_offset; } @@ -5674,7 +5674,7 @@ ctl_write_buffer(struct ctl_scsiio *ctsio) if (lun->write_buffer == NULL) { lun->write_buffer = malloc(CTL_WRITE_BUFFER_SIZE, - M_CTL, M_WAITOK); + M_CTL, M_WAITOK | M_ZERO); } /*