aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/bnx2fc
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2011-04-01 10:23:46 -0400
committerJames Bottomley <James.Bottomley@suse.de>2011-05-01 11:18:31 -0400
commit5c2dce26fd670607b5ff04f18efa38739805f6d6 (patch)
tree0664c48fd5610e2905ab849f088f3abeab75ee62 /drivers/scsi/bnx2fc
parentab6c10b136d5f8eb856a0f17247edc7c19805e1b (diff)
[SCSI] bnx2fc: introduce missing kfree
Error handling code following a kmalloc should free the allocated data. The semantic match that finds the problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @r exists@ local idexpression x; statement S; expression E; identifier f,f1,l; position p1,p2; expression *ptr != NULL; @@ x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); ... if (x == NULL) S <... when != x when != if (...) { <+...x...+> } ( x->f1 = E | (x->f1 == NULL || ...) | f(...,x->f1,...) ) ...> ( return \(0\|<+...x...+>\|ptr\); | return@p2 ...; ) @script:python@ p1 << r.p1; p2 << r.p2; @@ print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Acked-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/bnx2fc')
-rw-r--r--drivers/scsi/bnx2fc/bnx2fc_hwi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
index 1b680e288c56..f756d5f85c7a 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -522,6 +522,7 @@ void bnx2fc_process_l2_frame_compl(struct bnx2fc_rport *tgt,
522 fp = fc_frame_alloc(lport, payload_len); 522 fp = fc_frame_alloc(lport, payload_len);
523 if (!fp) { 523 if (!fp) {
524 printk(KERN_ERR PFX "fc_frame_alloc failure\n"); 524 printk(KERN_ERR PFX "fc_frame_alloc failure\n");
525 kfree(unsol_els);
525 return; 526 return;
526 } 527 }
527 528
@@ -547,6 +548,7 @@ void bnx2fc_process_l2_frame_compl(struct bnx2fc_rport *tgt,
547 */ 548 */
548 printk(KERN_ERR PFX "dropping ELS 0x%x\n", op); 549 printk(KERN_ERR PFX "dropping ELS 0x%x\n", op);
549 kfree_skb(skb); 550 kfree_skb(skb);
551 kfree(unsol_els);
550 return; 552 return;
551 } 553 }
552 } 554 }
@@ -563,6 +565,7 @@ void bnx2fc_process_l2_frame_compl(struct bnx2fc_rport *tgt,
563 } else { 565 } else {
564 BNX2FC_HBA_DBG(lport, "fh_r_ctl = 0x%x\n", fh->fh_r_ctl); 566 BNX2FC_HBA_DBG(lport, "fh_r_ctl = 0x%x\n", fh->fh_r_ctl);
565 kfree_skb(skb); 567 kfree_skb(skb);
568 kfree(unsol_els);
566 } 569 }
567} 570}
568 571