summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2009-09-11 06:21:51 +0000
committerDavid S. Miller <davem@davemloft.net>2009-09-11 12:54:30 -0700
commit966a5d1b85c45f1b55abbc1b595e0b5ca14b87db (patch)
tree7360488b3447653fd616ea0688a7614b25b500d7 /drivers/net
parent4fb019a01a7f67342d4a88d26c0817afe392c669 (diff)
downloadkernel-crypto-966a5d1b85c45f1b55abbc1b595e0b5ca14b87db.tar.gz
kernel-crypto-966a5d1b85c45f1b55abbc1b595e0b5ca14b87db.tar.xz
kernel-crypto-966a5d1b85c45f1b55abbc1b595e0b5ca14b87db.zip
drivers/net/wan: 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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wan/hdlc_ppp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 72a7cdab424..b9b9d6b01c0 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -389,6 +389,7 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id,
for (opt = data; len; len -= opt[1], opt += opt[1]) {
if (len < 2 || len < opt[1]) {
dev->stats.rx_errors++;
+ kfree(out);
return; /* bad packet, drop silently */
}