From nobody Fri Apr 26 03:13:53 2024 X-Original-To: dev-commits-src-main@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 4VQd9G0TJFz5HQZ1; Fri, 26 Apr 2024 03:13:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQd9F71h2z4YfB; Fri, 26 Apr 2024 03:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714101234; 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=CK9A/P3l3h6bvXB7aVmj1HyAph/yn7RMIXqUMsVJGfE=; b=FM9AyGfOJ9uGnt0xM6aiPSAycn9KTWmhN4hl5WeFf2D4d9iPtRfjlqb5suWc934NtBcHLw Cs38Mefior3L1sMHkbvpfZlDnlPmVy577jEddl2c0Lw45iTKega24e04jBo7UsPGbkTDyx NQnaF4juD2WR2agCNLCG1tkwbac+AQSH5E5O0mIl61p1gkTXlZzZfE1fRcqmbCti5TzhIV oMlNjN0LWb8VkXSEdrQSwYBD7q68+sOjK74oBSqVaMc0Z7OcrizuhghWM81tc9CPeDKSpJ Mry44iptwHHQJMBecbMXCel32MbdRlQUhwQPZG1WSKYQFiRdka0k7BS0NqiSAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714101234; a=rsa-sha256; cv=none; b=iKFJ81I7eQaqVge0LRqCIH8oBBrEZ2gojQ3lahMS4ibtMfsdFH3FedhENiAg0rhoHo3K+C gBJdPSSk5GRHZmRcaaFcjTIzx9WO+YHDJq4H9+HpRkC7he0wafkBIqbd/DogEooMOuWS0P x84PH8tDhk28Bv04AtZPnGLgPRSpE6BIX/cRUMscYmYuO8h7X9/pAxvEMiNq4HIWiN9r+t 4hQ4sOqVL+moYB8lyerEoe6/R08CFwWKhnGCe/S2geTMHFQ9t7mTuhwx/VPudHeVP21URC xZuEgUdwSs2B+tu8+P9zXR81VQ0ZzDv4O8Ya414wYnHJ4ocKnb6LoIHrPfQNAg== 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=1714101234; 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=CK9A/P3l3h6bvXB7aVmj1HyAph/yn7RMIXqUMsVJGfE=; b=Dl5AF3FoYtd5nH7dYiQhpL79veehPt5V4q3jLtJN50/Vb9+Nj365dppGJOukPSGe06TPnS /o+WHCMtxJvalCgYmRvmt1fDMIh72MqY8MgP3n2skxrPSeRLZtf6FasovCPPGSNQoTJEvR 9OWNGQx1FAhTSB87CZ1RRNbVktrDJKUjJ6wZG7k8uXpv6l2j29HJUXZV5/zVSUFGSsukVn MREetRIKB/QtOMwMDwjlX5460HOPgSBZNQet2hhygDguEDyJ7Z276pebWUhdrZ7KRcwc5s LxAmDy+LOVi+882TO8Uog/qTKsPg3bNK9EvaoJ3t8KdWw01WNbhxTYT6ODfQuA== 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 4VQd9F6cqHzR1Z; Fri, 26 Apr 2024 03:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43Q3Dr2R009583; Fri, 26 Apr 2024 03:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43Q3DrEh009580; Fri, 26 Apr 2024 03:13:53 GMT (envelope-from git) Date: Fri, 26 Apr 2024 03:13:53 GMT Message-Id: <202404260313.43Q3DrEh009580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f0e59ecff85d - main - CTL: READ(6) should be allowed on CD devices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0e59ecff85d4b9e875464199e065a269c9c2530 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f0e59ecff85d4b9e875464199e065a269c9c2530 commit f0e59ecff85d4b9e875464199e065a269c9c2530 Author: HP van Braam AuthorDate: 2024-04-26 02:31:12 +0000 Commit: Warner Losh CommitDate: 2024-04-26 02:31:14 +0000 CTL: READ(6) should be allowed on CD devices DOS ASPI drivers use this, with this change applied it is possible to load a DOS ASPI CDROM driver and run the Windows 98 installer. Signed-off-by: HP van Braam Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1202 --- sys/cam/ctl/ctl_cmd_table.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/cam/ctl/ctl_cmd_table.c b/sys/cam/ctl/ctl_cmd_table.c index 8b81ea7e56b3..a62c5e8c1e81 100644 --- a/sys/cam/ctl/ctl_cmd_table.c +++ b/sys/cam/ctl/ctl_cmd_table.c @@ -944,6 +944,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] = /* 08 READ(6) */ {ctl_read_write, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_DIRECT | CTL_FLAG_DATA_IN | + CTL_CMD_FLAG_OK_ON_CDROM | CTL_CMD_FLAG_ALLOW_ON_PR_WRESV, CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE, 6, {0x1f, 0xff, 0xff, 0xff, 0x07}},