Skip to content

Commit 4844123

Browse files
LGA1150kuba-moo
authored andcommitted
ppp: fix memory leak in pad_compress_skb
If alloc_skb() fails in pad_compress_skb(), it returns NULL without releasing the old skb. The caller does: skb = pad_compress_skb(ppp, skb); if (!skb) goto drop; drop: kfree_skb(skb); When pad_compress_skb() returns NULL, the reference to the old skb is lost and kfree_skb(skb) ends up doing nothing, leading to a memory leak. Align pad_compress_skb() semantics with realloc(): only free the old skb if allocation and compression succeed. At the call site, use the new_skb variable so the original skb is not lost when pad_compress_skb() fails. Fixes: b3f9b92 ("[PPP]: add PPP MPPE encryption module") Signed-off-by: Qingfang Deng <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Reviewed-by: Yue Haibing <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 8bbceba commit 4844123

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/net/ppp/ppp_generic.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,7 +1744,6 @@ pad_compress_skb(struct ppp *ppp, struct sk_buff *skb)
17441744
*/
17451745
if (net_ratelimit())
17461746
netdev_err(ppp->dev, "ppp: compressor dropped pkt\n");
1747-
kfree_skb(skb);
17481747
consume_skb(new_skb);
17491748
new_skb = NULL;
17501749
}
@@ -1845,9 +1844,10 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
18451844
"down - pkt dropped.\n");
18461845
goto drop;
18471846
}
1848-
skb = pad_compress_skb(ppp, skb);
1849-
if (!skb)
1847+
new_skb = pad_compress_skb(ppp, skb);
1848+
if (!new_skb)
18501849
goto drop;
1850+
skb = new_skb;
18511851
}
18521852

18531853
/*

0 commit comments

Comments
 (0)