The following commit has been merged in the linux branch: commit aec75ebca99c2d1728f84bbc1aa63c309ca9327e Author: simon simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c Date: Sun Dec 13 18:16:07 2009 +0000
Staging: batman-adv: Introduce missing kfree
Error handling code following a kzalloc should free the allocated data. Similarly for usb-alloc urb.
The semantic match that finds the first 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 Signed-off-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de Signed-off-by: Andrew Lunn andrew@lunn.ch
diff --git a/drivers/staging/batman-adv/send.c b/drivers/staging/batman-adv/send.c index 2712b03..fc4953f 100644 --- a/drivers/staging/batman-adv/send.c +++ b/drivers/staging/batman-adv/send.c @@ -361,8 +361,10 @@ void add_bcast_packet_to_list(unsigned char *packet_buff, int packet_len) return;
forw_packet->packet_buff = kmalloc(packet_len, GFP_ATOMIC); - if (!forw_packet->packet_buff) + if (!forw_packet->packet_buff) { + kfree(forw_packet); return; + }
forw_packet->packet_len = packet_len; memcpy(forw_packet->packet_buff, packet_buff, forw_packet->packet_len);