Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Kevin Groeneveld <kgroeneveld@lenbrook.com>
To:     "James E.J. Bottomley" <jejb@linux.ibm.com>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Kevin Groeneveld <kgroeneveld@lenbrook.com>
Subject: [PATCH] scsi: sr: fix typo in CDROM(CLOSETRAY|EJECT) handling
Date:   Tue, 22 Mar 2022 20:22:42 -0400
Message-Id: <20220323002242.21157-1-kgroeneveld@lenbrook.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RKMVjtz3PlTdNfhEZkvVO4Wsa4chJhfa4x0EJyFzyQDY3KNPlNLs/4IA78LD?=
 =?us-ascii?Q?9EbYj2TrW9EIksC3Td2yqo0HGa11QvojrwSZkCq+E1LCIr5lMFlLNgB0rFLx?=
 =?us-ascii?Q?W3mwC2m3rE5soDR4LoXWCnK6KIawwtSY5hXErWPlOLavgIQvEJSlXSsPPFTV?=
 =?us-ascii?Q?u6ezmYTIypLGTpqr9Xi0zhmp5wI1A3MNeUEjLn1IkuBhEiY43zXszkpa9QES?=
 =?us-ascii?Q?LXqTa318Pocgb84jKz6TesPrkgzkuGCumEw7Ysu4SG4wvqerLn4TJEuqCXqB?=
 =?us-ascii?Q?AfCFDtLng0ktAgz75M4FLBkRQ0e0Ra9Yl1nruVZUFXEH1O/IUw3TpoYoNyfz?=
 =?us-ascii?Q?4t8qSafGWpCAEKwhz1YLPfJv99n5HsDM7PEsqoc5/jHUiNSX+s2t4X9+c2IG?=
 =?us-ascii?Q?TVmt0cSliNHS4ibLAuTv0xTk1eHnMhIZVYhOpa/EtpQhdJtqd1hMhYAjBEt8?=
 =?us-ascii?Q?dCVKdnHq9JY0TiJcOtNEbf2ssTAY15/3KwVJ8F+ug+1xHM036nAQxrXlVA3e?=
 =?us-ascii?Q?rE43sA0ZqXAGHl9bw3xe4PvHd85AVjqXumRKJEpEx0M1CDcrBWmQJ8aN0wH4?=
 =?us-ascii?Q?9Qc+6lYQYYwmLaDOtkW+/Y6WmvaPVwcFnTIIQ2dkQW9MdEN7vRySm4JJzox/?=
 =?us-ascii?Q?i/nj3XtWYxw5XrsNCFDo4Dhtv9xNLxh6pDKF/OBEefndmEIomNFUj6Wn83Xz?=
 =?us-ascii?Q?5PRIU+1tjKJ92HVkrrJqy1ndEoXwyTgVsd+yKlAdY2eMNOFfwvIB0ADQo9ff?=
 =?us-ascii?Q?vy7pbqcltzA/Y1v9DTnP6VdUSwuiOD2yhDyFkl4uLaNRRqKhaKLM6LK3917T?=
 =?us-ascii?Q?Objg8JXqrbUJWimMxfnQpr7CP6NsjHkBeo6Ck9CRgGKcS1arZ9kCQu15jF13?=
 =?us-ascii?Q?jB3wpeukB1XMh0NCSzygEIBsFqJwX5zELwY4xyIZV14mNT1ehYLXjQXa6CoZ?=
 =?us-ascii?Q?PdSoFbBY5TEpxOi4sINxRiTZ+1NTrzof8QbrEhnbhJzEKOwvqq7qO+imcH1Q?=
 =?us-ascii?Q?SqyNr+N3c+Z7hzaqW+perxWwRBP4BYPJ6nF8qtvQRSQjLLke5fnh3xsSuxag?=
 =?us-ascii?Q?uXiZUVT+LDREP37bJ/4jBalOpGRqiN6RZh8qZCn7IDT2BWIdtgz95lNax2FH?=
 =?us-ascii?Q?d4luzMDL9vexTv4e/W7Q/dlaaVSHTxoE4sySibKM/JosGGPxM1VfqufmiPgE?=
 =?us-ascii?Q?JzJtj+eMxpSZLpjUDLz1R5HnYamNYjJ0T/jF00ez877iZ7tttmd0jcBHkygf?=
 =?us-ascii?Q?aCIEIyojzPn6etHDDEs7NIfMAbgzgV6j2EPzC+sdESot08RyDEriiEO8d1Ni?=
 =?us-ascii?Q?lQ8WAdwoNr5nvDvMhF00p8AXFzZGcs02mEzmul3DQxUVRUHoZld3qSwx7lxT?=
 =?us-ascii?Q?Xwl3ihB4MRZUER36/wSmqD5JzcAK/OehzAlDJc3fPc6DmRrwX9CZgbX4l68o?=
 =?us-ascii?Q?rAcFZzdIb1+2cBNJHhqZqa2RBtpKxC8Sq+iqp8gSckBcogjAj1/z0w=3D=3D?=
X-OriginatorOrg: lenbrook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ab0ab5cc-7808-4f70-5ece-08da0c634aeb
X-MS-Exchange-CrossTenant-AuthSource: YT4PR01MB9670.CANPRD01.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2022 00:23:02.6612
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3089fb55-f9f3-4ac8-ba44-52ac0e467cb6
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 9GYLWNPycsFI6Gk9kiN7Z/hCdHhoVw7vYf2zPjqQzyF0dKYRAhqf9t90OqS4+x5hlxMMbEpnh+RhzeZZNFcy2z7aVVt2Obd0lx48+wXzYX4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT3PR01MB9009
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Commit 2e27f576abc6 ("scsi: scsi_ioctl: Call scsi_cmd_ioctl() from
scsi_ioctl()") seems to have a typo as it is checking ret instead of
cmd in the if statement checking for CDROMCLOSETRAY and CDROMEJECT.
This changes the behaviour of these ioctls as the cdrom_ioctl
handling of these is more restrictive than the scsi_ioctl version.

Fixes: 2e27f576abc6 ("scsi: scsi_ioctl: Call scsi_cmd_ioctl() from scsi_ioctl()")
Signed-off-by: Kevin Groeneveld <kgroeneveld@lenbrook.com>
---
 drivers/scsi/sr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index f925b1f1f9ad..a0beb11abdc9 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -578,7 +578,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
 
 	scsi_autopm_get_device(sdev);
 
-	if (ret != CDROMCLOSETRAY && ret != CDROMEJECT) {
+	if (cmd != CDROMCLOSETRAY && cmd != CDROMEJECT) {
 		ret = cdrom_ioctl(&cd->cdi, bdev, mode, cmd, arg);
 		if (ret != -ENOSYS)
 			goto put;
-- 
2.17.1