]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
scsi: iscsi: Fix redundant response for ISCSI_UEVENT_GET_HOST_STATS request
authorXiang Zhang <hawkxiang.cpp@gmail.com>
Tue, 7 Jan 2025 02:24:31 +0000 (10:24 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 10 Jan 2025 02:01:25 +0000 (21:01 -0500)
The ISCSI_UEVENT_GET_HOST_STATS request is already handled in
iscsi_get_host_stats(). This fix ensures that redundant responses are
skipped in iscsi_if_rx().

 - On success: send reply and stats from iscsi_get_host_stats()
   within if_recv_msg().

 - On error: fall through.

Signed-off-by: Xiang Zhang <hawkxiang.cpp@gmail.com>
Link: https://lore.kernel.org/r/20250107022432.65390-1-hawkxiang.cpp@gmail.com
Reviewed-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/scsi_transport_iscsi.c

index fde7de3b1e55381f7cd468ad308a3e4ee9417c8c..9b47f91c5b9720255b029f6a15c276efe50dc7fc 100644 (file)
@@ -4104,7 +4104,7 @@ iscsi_if_rx(struct sk_buff *skb)
                }
                do {
                        /*
-                        * special case for GET_STATS:
+                        * special case for GET_STATS, GET_CHAP and GET_HOST_STATS:
                         * on success - sending reply and stats from
                         * inside of if_recv_msg(),
                         * on error - fall through.
@@ -4113,6 +4113,8 @@ iscsi_if_rx(struct sk_buff *skb)
                                break;
                        if (ev->type == ISCSI_UEVENT_GET_CHAP && !err)
                                break;
+                       if (ev->type == ISCSI_UEVENT_GET_HOST_STATS && !err)
+                               break;
                        err = iscsi_if_send_reply(portid, nlh->nlmsg_type,
                                                  ev, sizeof(*ev));
                        if (err == -EAGAIN && --retries < 0) {