Author: simon Date: 2009-12-13 18:16:07 +0000 (Sun, 13 Dec 2009) New Revision: 1492

Modified: trunk/batman-adv-kernelland/send.c Log: 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

Modified: trunk/batman-adv-kernelland/send.c =================================================================== --- trunk/batman-adv-kernelland/send.c 2009-12-05 15:43:00 UTC (rev 1491) +++ trunk/batman-adv-kernelland/send.c 2009-12-13 18:16:07 UTC (rev 1492) @@ -361,8 +361,10 @@ 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);