Skip to contentSkip to conversation

drivers/scsi/ses.c: eliminate double free

PATCH In review [email protected] 1 participant 1 message Feb 2, 2010 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 drivers/scsi/ses.c: eliminate double free

From: Julia Lawall <[email protected]>

The few lines below the kfree of hdr_buf may go to the label err_free which will also free hdr_buf. The most straightforward solution seems to be to just move the kfree of hdr_buf after these gotos.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r@
identifier E;
expression E1;
iterator I;
statement S;
@@

*kfree(E);
... when != E = E1

    when != I(E,...) S
    when != &E

*kfree(E);
// </smpl>

---

 drivers/scsi/ses.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/ses.c renamed from drivers/scsi/ses.c~drivers-scsi-sesc-eliminate-double-free +2 -2
diff -puN drivers/scsi/ses.c~drivers-scsi-sesc-eliminate-double-free drivers/scsi/ses.c
@@ -595,8 +595,6 @@ static int ses_intf_add(struct device *c
 		ses_dev->page10_len = len;
 		buf = NULL;
 	}
-	kfree(hdr_buf);
-
 	scomp = kzalloc(sizeof(struct ses_component) * components, GFP_KERNEL);
 	if (!scomp)
 		goto err_free;
@@ -608,6 +606,8 @@ static int ses_intf_add(struct device *c
 		goto err_free;
 	}
 
+	kfree(hdr_buf);
+
 	edev->scratch = ses_dev;
 	for (i = 0; i < components; i++)
 		edev->component[i].scratch = scomp + i;

_