public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Yue Haibing <yuehaibing@huawei.com>
To: Qingfang Deng <dqfext@gmail.com>,
	Andrew Lunn <andrew+netdev@lunn.ch>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Paul Mackerras <paulus@ozlabs.org>,
	Matt Domsch <Matt_Domsch@dell.com>, Andrew Morton <akpm@osdl.org>,
	Brice Goglin <Brice.Goglin@ens-lyon.org>,
	<linux-ppp@vger.kernel.org>, <netdev@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH net] ppp: fix memory leak in pad_compress_skb
Date: Wed, 3 Sep 2025 20:22:56 +0800	[thread overview]
Message-ID: <289a62a2-e277-41b3-a78f-4ff7a0a23881@huawei.com> (raw)
In-Reply-To: <20250903100726.269839-1-dqfext@gmail.com>

On 2025/9/3 18:07, Qingfang Deng wrote:
> 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: b3f9b92a6ec1 ("[PPP]: add PPP MPPE encryption module")
> Signed-off-by: Qingfang Deng <dqfext@gmail.com>
> ---
>  drivers/net/ppp/ppp_generic.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
> index 65795d099166..f9f0f16c41d1 100644
> --- a/drivers/net/ppp/ppp_generic.c
> +++ b/drivers/net/ppp/ppp_generic.c
> @@ -1744,7 +1744,6 @@ pad_compress_skb(struct ppp *ppp, struct sk_buff *skb)
>  		 */
>  		if (net_ratelimit())
>  			netdev_err(ppp->dev, "ppp: compressor dropped pkt\n");
> -		kfree_skb(skb);
>  		consume_skb(new_skb);
>  		new_skb = NULL;
>  	}
> @@ -1845,9 +1844,10 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
>  					   "down - pkt dropped.\n");
>  			goto drop;
>  		}
> -		skb = pad_compress_skb(ppp, skb);
> -		if (!skb)
> +		new_skb = pad_compress_skb(ppp, skb);
> +		if (!new_skb)
>  			goto drop;
> +		skb = new_skb;
>  	}
>  
>  	/*

Reviewed-by: Yue Haibing <yuehaibing@huawei.com>

  parent reply	other threads:[~2025-09-03 12:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-03 10:07 [PATCH net] ppp: fix memory leak in pad_compress_skb Qingfang Deng
2025-09-03 11:18 ` Eric Dumazet
2025-09-03 12:22 ` Yue Haibing [this message]
2025-09-04 14:40 ` patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=289a62a2-e277-41b3-a78f-4ff7a0a23881@huawei.com \
    --to=yuehaibing@huawei.com \
    --cc=Brice.Goglin@ens-lyon.org \
    --cc=Matt_Domsch@dell.com \
    --cc=akpm@osdl.org \
    --cc=andrew+netdev@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=dqfext@gmail.com \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-ppp@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=paulus@ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox