]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
target:fix condition return in core_pr_dump_initiator_port()
authortangwenji <tang.wenji@zte.com.cn>
Thu, 24 Aug 2017 11:59:37 +0000 (19:59 +0800)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 17 Jan 2018 17:55:37 +0000 (12:55 -0500)
[ Upstream commit 24528f089d0a444070aa4f715ace537e8d6bf168 ]

When is pr_reg->isid_present_at_reg is false,this function should return.

This fixes a regression originally introduced by:

  commit d2843c173ee53cf4c12e7dfedc069a5bc76f0ac5
  Author: Andy Grover <agrover@redhat.com>
  Date:   Thu May 16 10:40:55 2013 -0700

      target: Alter core_pr_dump_initiator_port for ease of use

Signed-off-by: tangwenji <tang.wenji@zte.com.cn>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
drivers/target/target_core_pr.c

index 57fd4e14d4eb26aa07e7dce94ed334b648885d55..770fc5ae26a730247bd1a71910a4aee2ced43a0b 100644 (file)
@@ -58,8 +58,10 @@ void core_pr_dump_initiator_port(
        char *buf,
        u32 size)
 {
-       if (!pr_reg->isid_present_at_reg)
+       if (!pr_reg->isid_present_at_reg) {
                buf[0] = '\0';
+               return;
+       }
 
        snprintf(buf, size, ",i,0x%s", pr_reg->pr_reg_isid);
 }