From nobody Wed Sep 04 20:54:18 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 4WzZVL4Fzkz5VMSf; Wed, 04 Sep 2024 20:54:18 +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 4WzZVL1jhzz4QJx; Wed, 4 Sep 2024 20:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725483258; 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=5jZsOch6SNlIMqrgTPr30XJl2L3WSyk+yz7OZXLLogM=; b=nXOjAEkzDCjH4mTiYdfacxqh8eSpEka1B0tzWdbwMBza54Uc/vwev72Y7MrKec8vH53hoa 4qLP/CrfCQYcJ84RpU6sEzZ1XQ7hdlwsOuQTUy5DXvz8kJmCgLEr+L7BsUm+9gHdJP46wl ERfaimO/hyVrOWPfh2zYun2fx/TJvQnv9CHTFPDt9xS0mKT7buESbVuE/s5xbCQcdS0+So zOxHIOpOSny0N4qiicS9wuh6ZFXYgR0/rBosUtuLxjs6hZxISRwb7KH/cXkoAsnrFrTsw7 V41qXjNfpP1kbkl+it+UPRNTT1CEIqWhqzsjUPV1mdIFC3tWd1xjt0Vpbl2cRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725483258; a=rsa-sha256; cv=none; b=i7BVAd4z1IcUCLA+J8sB+rYWtBEfxADamlIDmDgZWF6A2KnWUt/F5ejWlovPPeMhquFV7R OAO0cpNj/gm0WRAG2j9qt5ZykTHYDHVozcqpHDeAPd2xXQucCswxKtpAOM8+eP5Y27QQkq K+cgHEhVUH8uoAlZe/ZP8hcf22Eg5VKcu/P+pBYWgWaE7neajhlqJkW7Qq32yZITH9M965 PINVOu6bCXF6OQp5XdrlRF1DGJrXnnKLL/qfN9SNRqQpBmDNW2U3HjxMJ9JqrC6VR55ABY eU8N5NF5i1lPccQz0nfzcGcXlC4X8nyo/yAZktDdw6wV2IvNlrhOWrxVjy3GSQ== 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=1725483258; 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=5jZsOch6SNlIMqrgTPr30XJl2L3WSyk+yz7OZXLLogM=; b=yZ82GM16Bz6ld8HjjH9nVf2zu1qZ464lelYRrD+eOZrQ/yt+VSmZLwywvJFHNCdLTXJDQX /uFNSyrb5zNj3ffC2pWHjD/a67Jgb6iFFnsq8sRlVz0CYWfnhdL8J1rXzM4jmn24Q7+2rL p3ZfrlGZxSYV28vASMvLM4FVhNmdUnghQ+fW7G4VM0bQjns76HWc8jkXZQOOvmM9wiS/rP OpvvGpxFEt8MFBirQ/wbDqNX/TgHfJm4rEQdM6SCHzEYkqwVmaN3WY9H0ZfSRz1lno4iRT 2YYY7I66T6hfrZ0DrBgGOWn5+NgEDZs3bLSMubUTyxf7P06ATMoFBiBNDqaqsw== 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 4WzZVL1Cz6zgYC; Wed, 4 Sep 2024 20:54:18 +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 484KsIo0033929; Wed, 4 Sep 2024 20:54:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484KsILt033926; Wed, 4 Sep 2024 20:54:18 GMT (envelope-from git) Date: Wed, 4 Sep 2024 20:54:18 GMT Message-Id: <202409042054.484KsILt033926@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: 4c60b8289d0e - releng/14.0 - ctl: avoid heap info leak in ctl_request_sense 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.0 X-Git-Reftype: branch X-Git-Commit: 4c60b8289d0eaa4eb080ad96a7089635a691eee5 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4c60b8289d0eaa4eb080ad96a7089635a691eee5 commit 4c60b8289d0eaa4eb080ad96a7089635a691eee5 Author: Ed Maste AuthorDate: 2024-08-20 18:12:47 +0000 Commit: Ed Maste CommitDate: 2024-09-04 20:54:02 +0000 ctl: avoid heap info leak in ctl_request_sense Previously 3 bytes of data from the heap could be leaked to ctl consumers. Reported by: Synacktiv Reviewed by: asomers, mav Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46091 (cherry picked from commit db87c98168b1605f067d283fa36a710369c3849d) (cherry picked from commit 131b7dcb2fbf8f15815387f60536d9cc16585b0d) Approved by: so --- sys/cam/ctl/ctl.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 5f5987e515c0..4706b424880f 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -9342,14 +9342,8 @@ ctl_request_sense(struct ctl_scsiio *ctsio) sense_ptr = (struct scsi_sense_data *)ctsio->kern_data_ptr; ctsio->kern_sg_entries = 0; ctsio->kern_rel_offset = 0; - - /* - * struct scsi_sense_data, which is currently set to 256 bytes, is - * larger than the largest allowed value for the length field in the - * REQUEST SENSE CDB, which is 252 bytes as of SPC-4. - */ - ctsio->kern_data_len = cdb->length; - ctsio->kern_total_len = cdb->length; + ctsio->kern_data_len = ctsio->kern_total_len = + MIN(cdb->length, sizeof(*sense_ptr)); /* * If we don't have a LUN, we don't have any pending sense.