From nobody Wed Sep 04 15:51:06 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 4WzRmX0ry1z5V7cY; Wed, 04 Sep 2024 15:51:08 +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 4WzRmV5sJkz4TQV; Wed, 4 Sep 2024 15:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725465066; 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=xNACK404LNDjcAT9jB3e8UJO+/URFuCaG9vIH11uGLs=; b=gKCtCPxbBVJdVw1eDRxiH11FG0wLl4VwfiyXDY2/+22+SKiqwOcM4cphJouLb2+u1FTr/d kyiQPGUHZLikyS8zzNrORRPCuxf+T/aQ9tghvoGooWY41lEENpkomwfXlc855b2yaxp3pz 611hNRUyHgWa1lFkYD6uHKzWWi+MQfrqHfqBAwi6egbCcvPM2M3IlZ5LtGQtQwq43Rpa2/ 8Uyd3Y3f//EZaIqg31vugdIUuDeBXQW3G+NfHwil2CWWYDJXL4gjYMnkLhrzDV7a9jeEKP URHX+eV70J/rlzlVbbnITIKqmDA01/66+1Pbteg8vQVqlASE+O3xf8yYlC3oSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725465066; a=rsa-sha256; cv=none; b=Izxu8pJGz2S4L0hgE0Qeymu/jj/nrB12q+5v8Ukkgy9FaWhCIAMkq8wI9J5P4iWT1Q6dRb 84g0omAzC4To14CyXViQsV1rJjCdreT5xHQvFscgQIrDsozSTAXosebsJYfhQw0VRCAqZv Wc3DYkJRZCpGZuMTzjNyqfF20sUd8yxklPmyogyQH76O6ylH3MkkHWvVulfU6DUzVRABD4 35spDWFumG5uOwtNHzdjUoF+aHCB0W7Hh7OBMhVF+HIILA/pczrUjhGTLNmxC7qlIigsWz uHdSly2bfnXkEqzeYvHiDwcLOS2Es5hdJn3YCEZx3BeiUKzqLF9XlSlgp+yjNQ== 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=1725465066; 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=xNACK404LNDjcAT9jB3e8UJO+/URFuCaG9vIH11uGLs=; b=go6XuS3gbXv1K6+l76KsBOScxU7+yK0nBEl8I2d0xiiLT5vQWzgL+jdb2jAFKfzqFxnrYZ +ktXeOxsUiYwuO3s59GrpXsX7JUWxsmTF+cx0VqX5YhKXvIO9xUqSaS42ytC7Sj22q4ttW 3o7gLiQut2Dw52NtJ+T93rWbJR5DyJxSzR/wplgArMCFftMfjgAG/traz+sJ1mGCbdaFbN qD2vCE1dSRAf+8CQIdg9rzW42u3jttRBciXFmm2kMHYgVhJ3fI8ji+Xk6fA8ZkI4MQ9jlw s1NyyyWSes6UsA/JCjUWka0FhGEdLhpswgtmrJuDG+3a8Qmf4JkB1If8KswOiw== 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 4WzRmV4dXVzWj4; Wed, 4 Sep 2024 15:51:06 +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 484Fp6Ii015536; Wed, 4 Sep 2024 15:51:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Fp6CT015533; Wed, 4 Sep 2024 15:51:06 GMT (envelope-from git) Date: Wed, 4 Sep 2024 15:51:06 GMT Message-Id: <202409041551.484Fp6CT015533@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: cdfdb3b00862 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: cdfdb3b0086268cdc365174ebfb69e66b5dde0b5 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cdfdb3b0086268cdc365174ebfb69e66b5dde0b5 commit cdfdb3b0086268cdc365174ebfb69e66b5dde0b5 Author: Pierre Pronchery AuthorDate: 2024-09-04 14:38:11 +0000 Commit: Ed Maste CommitDate: 2024-09-04 14:59:52 +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) --- 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 b449e05889ec..b9013e84ef83 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -5634,7 +5634,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; } @@ -5675,7 +5675,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); } /*