[Xen-devel] [PATCH 2/3] xen-scsiback: One function call less in scsiback_device_action() after error detection

[SF Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>]

From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Sat, 16 Jul 2016 21:42:42 +0200

The kfree() function was called in one case by the
scsiback_device_action() function during error handling
even if the passed variable "tmr" contained a null pointer.

Adjust jump targets according to the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
 drivers/xen/xen-scsiback.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 4a48c06..7612bc9 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -606,7 +606,7 @@ static void scsiback_device_action(struct vscsibk_pend 
*pending_req,
        tmr = kzalloc(sizeof(struct scsiback_tmr), GFP_KERNEL);
        if (!tmr) {
                target_put_sess_cmd(se_cmd);
-               goto err;
+               goto do_resp;
        }
 
        init_waitqueue_head(&tmr->tmr_wait);
@@ -616,7 +616,7 @@ static void scsiback_device_action(struct vscsibk_pend 
*pending_req,
                               unpacked_lun, tmr, act, GFP_KERNEL,
                               tag, TARGET_SCF_ACK_KREF);
        if (rc)
-               goto err;
+               goto free_tmr;
 
        wait_event(tmr->tmr_wait, atomic_read(&tmr->tmr_complete));
 
@@ -626,8 +626,9 @@ static void scsiback_device_action(struct vscsibk_pend 
*pending_req,
        scsiback_do_resp_with_sense(NULL, err, 0, pending_req);
        transport_generic_free_cmd(&pending_req->se_cmd, 1);
        return;
-err:
+free_tmr:
        kfree(tmr);
+do_resp:
        scsiback_do_resp_with_sense(NULL, err, 0, pending_req);
 }
 
-- 
2.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel