From nobody Wed Sep 04 21:07:31 2024 X-Original-To: dev-commits-src-branches@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 4WzZnb4qRtz5VNmF; Wed, 04 Sep 2024 21:07:31 +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 4WzZnb3C8lz4VYb; Wed, 4 Sep 2024 21:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725484051; 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=XkVfKFNPhV5PVlkqBPgMFDVtV4ZaT2J9S6DR70ncv7g=; b=yLxoVGGB5qoMnv0CSjxho7DHDevDhrreEHuET+IR/dAGuw3H88H3KK32CRa4wWIXs/KSKy s3M2Ov4RxUgZoDfutOLMNdYSSpn8PyPkRpL/SRCv4I4ma7qFKv6l8f7FQBtL8Zn+oUc9v/ LouyfjbDocVnJsImJqchFhuBch1qvmwooFVa4SCYzkrOV1+Yb0deuvBS/zHFN3T0+HH7oy YLCuQPGHrSCSvnbtGYQsUwbyVZrm5bQxnKoKOtCkKPvx0RWi+FpovSpv1oXxOxuXuR2Wqu gMcLNB5XBFC+8AnLUFNlbVWF1ro6Rw315OpjHidcsR5a+p4QJsN70z9RmNmyKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725484051; a=rsa-sha256; cv=none; b=wn27fqeN14zA4i8QLh/rtVHEkHeTWmbd1oOgFT/uve9xX6rDJDTybhmv/Bb0BvI+dfIFdm 7i/EnAyF4wouqvq487EVKQwU0ZvkOvjM/H4+t9exhmCd2LHXwmMgqMoUkndlTkQbtcud9r mv1x0vm5/9l9FiIO03eyWl8tHAO4q6e/C8NMweUlttcJDCqlRDYpXXLvkvwjwUJO3rTFNx bT0BEJaX4HbgFONPFDv6sbAr2WtBaahlNlf0yNnVK7IE2UtVexkxSn/z+2R7eJXm3ze9EH xxP6ONEETASAYOyoK5KZHO0OElxNbYlqpP98PZJC3ktHb7p8gJkTdZI4hbkBFw== 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=1725484051; 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=XkVfKFNPhV5PVlkqBPgMFDVtV4ZaT2J9S6DR70ncv7g=; b=eclOFkzcYFRaI9iEqMsLLeXOKxJ/AAi6Xt+nNf3FNtP4yLyeDPRV+d3MhDNSP6vRaQmK4Z Gi9WpeBWFfNFkc/KgWmUPKM893r7VJUcgOISEOcNOT8EHllQW/fJv3JEgccQzhtouFSuY7 k1nbf8m+8nsg3B33dwGAK0XbVcjd/FgBmF6I9YmnhEKN5sRj1O+9cY4I1S/ka3D77d+wjD vV3TtmRaJ0BZlBUX1qXgUXxAP8YLWK2TCegbLAHG1szV8luoaxWgJObXQK+0c3X8zEh2uX XfoHha4uTcKfUstVwR9zvhDtFvoPIhGFEJlXSeybbfixmJkO3vWF2dRzt93e/w== 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 4WzZnb1sh4zgcT; Wed, 4 Sep 2024 21:07:31 +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 484L7VlA053242; Wed, 4 Sep 2024 21:07:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484L7VVE053239; Wed, 4 Sep 2024 21:07:31 GMT (envelope-from git) Date: Wed, 4 Sep 2024 21:07:31 GMT Message-Id: <202409042107.484L7VVE053239@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: 235b93d39d71 - releng/14.1 - ctl: fix memory disclosure in read/write buffer commands List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14.1 X-Git-Reftype: branch X-Git-Commit: 235b93d39d71860983b15ce8ad63f0a939cd1be9 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=235b93d39d71860983b15ce8ad63f0a939cd1be9 commit 235b93d39d71860983b15ce8ad63f0a939cd1be9 Author: Pierre Pronchery AuthorDate: 2024-09-04 14:38:11 +0000 Commit: Ed Maste CommitDate: 2024-09-04 20:46:54 +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) Approved by: so --- 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 7fb38c794a4c..9752ca93d36c 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); } /*