]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
scsi: target: tcmu: Return from tcmu_handle_completions() if cmd_id not found
authorBodo Stroesser <bostroesser@gmail.com>
Fri, 23 Apr 2021 15:01:23 +0000 (17:01 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 18 Jun 2021 13:02:25 +0000 (15:02 +0200)
BugLink: https://bugs.launchpad.net/bugs/1931158
[ Upstream commit 9814b55cde0588b6d9bc496cee43f87316cbc6f1 ]

If tcmu_handle_completions() finds an invalid cmd_id while looping over cmd
responses from userspace it sets TCMU_DEV_BIT_BROKEN and breaks the
loop. This means that it does further handling for the tcmu device.

Skip that handling by replacing 'break' with 'return'.

Additionally change tcmu_handle_completions() from unsigned int to bool,
since the value used in return already is bool.

Link: https://lore.kernel.org/r/20210423150123.24468-1-bostroesser@gmail.com
Signed-off-by: Bodo Stroesser <bostroesser@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/target/target_core_user.c

index d6634baebb474496746c8a8c2a481eb317cafd1b..71144e33272a3fee2db4247a5b3eb8c722f0fc52 100644 (file)
@@ -1205,7 +1205,7 @@ static void tcmu_set_next_deadline(struct list_head *queue,
                del_timer(timer);
 }
 
-static unsigned int tcmu_handle_completions(struct tcmu_dev *udev)
+static bool tcmu_handle_completions(struct tcmu_dev *udev)
 {
        struct tcmu_mailbox *mb;
        struct tcmu_cmd *cmd;
@@ -1245,7 +1245,7 @@ static unsigned int tcmu_handle_completions(struct tcmu_dev *udev)
                        pr_err("cmd_id %u not found, ring is broken\n",
                               entry->hdr.cmd_id);
                        set_bit(TCMU_DEV_BIT_BROKEN, &udev->flags);
-                       break;
+                       return false;
                }
 
                tcmu_handle_completion(cmd, entry);