From nobody Wed Sep 4 15:53:53 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 4WzRqj4s0Tz5V8F6; Wed, 04 Sep 2024 15:53:53 +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 4WzRqj3r7yz4Vd6; Wed, 4 Sep 2024 15:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725465233; 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=or+Xuuh9j2pqTwqxa8TEadc1+RPhiwUY0oOiDebqHBY=; b=ZNT4QIfigkkAZetx5R7snRewB9gjIisLrRUdX89+FoOD++jk5WILjMRGJK/NtTlD89mI7D hNr949o3NwBwYBmQf7xgy8ckjPE6lD4Mlupf96royN4Mqn/CDPJBeLrQa5/OmU5PRTbTP/ yUy4ARo1SA/V3V54pweaoLNdUT4JE6ODRNi7cnzscfpu65ketMBU9ZFVZMpytWckR0axU/ DQ63YyuMr8sxZSgAdVT68bUe3dm4XmiZvs5WhRhxgCJNmwnAZdkdwHnpwjJxh8SCjyUj6A MF1HIouGOoHNafJo55KzbOiPMbOzwydFe/FQwA24qQ5NBkQWwcdyqyN+HM003g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725465233; a=rsa-sha256; cv=none; b=GzHRB/vMjBgp2pfB0ZVdrxPmip3tUqokRZx4gNA+RiaZHXv4El8WCrrEUy/OPQ6iDFvEnp 6LP/VHFyQzEB2F58Rjr2ChNKs+3HIjgTNFGhw53LNah8ZObnWP2pCc6dwtZGSLRZ/hfjKA uIT9idQ4EHcov26Sva9eno7IUQNCKiEmDzrtkloyiVoWI4aalbTCHDMCXCCOGc68+mdxlG xCQJALXb5PpoY1s6yt5R/bktpqkFgs+lvte31r2hRN9Ue600x3wwgxJoMXi0OB1HoYZjaD iX2UHMNwnTvdXkqjj2BXfCwXrRLedgezvxUDGVi1PShW9TH0F1KmQmbymIUxHQ== 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=1725465233; 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=or+Xuuh9j2pqTwqxa8TEadc1+RPhiwUY0oOiDebqHBY=; b=ttkX3kP20gmu8MZWYjIg7EPb1Xb+xwN5gEA/gXVVR0GYHmTU2tSJ8ZbZ/9u0uRQgmtS+Ox icpeR49idLZqXoBY15DjJ+tZJRaNY6KT2ubje9tTTqIjNb2La4+shzcSVKIkM0mDh1/4S8 wk1b3QWCKWlbZywAmCvFKLYB14HMy/3/gMdrL8OWYnQDu+0k5tAZksAWtSzU6h52/Sjhzt Xra8IttOofZcJ7d13c2PRB8Y9FJa3hble6RDw12klXFhE2psHnt+eUKHcevHmWw72MsZN1 PDKMREImpeLtruCgN3xpc7RksFh2OXbH/penNK/C+SCQkEjVdsLsbo3qOZBS5A== 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 4WzRqj3RmnzWjK; Wed, 4 Sep 2024 15:53:53 +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 484FrrST019855; Wed, 4 Sep 2024 15:53:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Frrg4019852; Wed, 4 Sep 2024 15:53:53 GMT (envelope-from git) Date: Wed, 4 Sep 2024 15:53:53 GMT Message-Id: <202409041553.484Frrg4019852@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: c8afc072690f - stable/13 - ctl: fix Out-Of-Bounds access in ctl_report_supported_opcodes 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/stable/13 X-Git-Reftype: branch X-Git-Commit: c8afc072690fd7541159cfe76c544797a5b37bce Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c8afc072690fd7541159cfe76c544797a5b37bce commit c8afc072690fd7541159cfe76c544797a5b37bce Author: Pierre Pronchery AuthorDate: 2024-09-04 14:38:12 +0000 Commit: Ed Maste CommitDate: 2024-09-04 15:52:33 +0000 ctl: fix Out-Of-Bounds access in ctl_report_supported_opcodes This vulnerability is directly accessible to a guest VM through the pci_virtio_scsi bhyve device. In the function ctl_report_supported_opcodes() accessible from the VM, the option RSO_OPTIONS_OC_ASA does not check the requested service_action value before accessing &ctl_cmd_table[]. Reported by: Synacktiv Reviewed by: asomers Security: FreeBSD-SA-24:11.ctl Security: CVE-2024-42416 Security: HYP-06 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46027 (cherry picked from commit af438acbfde3d25dbdc82b2b3d72380f0191e9d9) (cherry picked from commit 803e0c2ab29bb6b715c38e82da4930d46590e8e0) --- sys/cam/ctl/ctl.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index f9fec62249cb..b0f34cafac80 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -7513,20 +7513,19 @@ ctl_report_supported_opcodes(struct ctl_scsiio *ctsio) case RSO_OPTIONS_OC_SA: if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) == 0 || service_action >= 32) { - ctl_set_invalid_field(/*ctsio*/ ctsio, - /*sks_valid*/ 1, - /*command*/ 1, - /*field*/ 2, - /*bit_valid*/ 1, - /*bit*/ 2); - ctl_done((union ctl_io *)ctsio); - return (CTL_RETVAL_COMPLETE); + goto invalid; } - /* FALLTHROUGH */ + total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32; + break; case RSO_OPTIONS_OC_ASA: + if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) != 0 && + service_action >= 32) { + goto invalid; + } total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32; break; default: +invalid: ctl_set_invalid_field(/*ctsio*/ ctsio, /*sks_valid*/ 1, /*command*/ 1,