From: Oleksij Rempel <o.rempel@pengutronix.de>
To: Fedor Pchelkin <pchelkin@ispras.ru>
Cc: Robin van der Gracht <robin@protonic.nl>,
ldv-project@linuxtesting.org,
Oliver Hartkopp <socketcan@hartkopp.net>,
linux-can@vger.kernel.org, Eric Dumazet <edumazet@google.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
Alexey Khoroshilov <khoroshilov@ispras.ru>,
kernel@pengutronix.de, netdev@vger.kernel.org,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
"David S . Miller" <davem@davemloft.net>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] can: j1939: fix memory leak of skbs
Date: Fri, 5 Aug 2022 18:20:08 +0200 [thread overview]
Message-ID: <20220805162008.GA2585@pengutronix.de> (raw)
In-Reply-To: <20220805150216.66313-1-pchelkin@ispras.ru>
On Fri, Aug 05, 2022 at 06:02:16PM +0300, Fedor Pchelkin wrote:
> We need to drop skb references taken in j1939_session_skb_queue() when
> destroying a session in j1939_session_destroy(). Otherwise those skbs
> would be lost.
>
> Link to Syzkaller info and repro: https://forge.ispras.ru/issues/11743.
>
> Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
>
> Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
> Suggested-by: Oleksij Rempel <o.rempel@pengutronix.de>
> Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
> Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> net/can/j1939/transport.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
> index 307ee1174a6e..d7d86c944d76 100644
> --- a/net/can/j1939/transport.c
> +++ b/net/can/j1939/transport.c
> @@ -260,6 +260,8 @@ static void __j1939_session_drop(struct j1939_session *session)
>
> static void j1939_session_destroy(struct j1939_session *session)
> {
> + struct sk_buff *skb;
> +
> if (session->transmission) {
> if (session->err)
> j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_ABORT);
> @@ -274,7 +276,11 @@ static void j1939_session_destroy(struct j1939_session *session)
> WARN_ON_ONCE(!list_empty(&session->sk_session_queue_entry));
> WARN_ON_ONCE(!list_empty(&session->active_session_list_entry));
>
> - skb_queue_purge(&session->skb_queue);
> + while ((skb = skb_dequeue(&session->skb_queue)) != NULL) {
> + /* drop ref taken in j1939_session_skb_queue() */
> + skb_unref(skb);
> + kfree_skb(skb);
> + }
> __j1939_session_drop(session);
> j1939_priv_put(session->priv);
> kfree(session);
> --
> 2.25.1
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2022-08-05 16:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-05 15:02 [PATCH] can: j1939: fix memory leak of skbs Fedor Pchelkin
2022-08-05 16:20 ` Oleksij Rempel [this message]
2022-08-08 7:56 ` Marc Kleine-Budde
-- strict thread matches above, loose matches on Subject: below --
2022-07-08 17:59 Fedor Pchelkin
2022-07-29 4:22 ` Oleksij Rempel
2022-08-05 8:56 ` Fedor Pchelkin
2022-08-05 9:55 ` Oleksij Rempel
2022-08-05 14:55 ` Fedor Pchelkin
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=20220805162008.GA2585@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kernel@pengutronix.de \
--cc=khoroshilov@ispras.ru \
--cc=kuba@kernel.org \
--cc=ldv-project@linuxtesting.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pchelkin@ispras.ru \
--cc=robin@protonic.nl \
--cc=socketcan@hartkopp.net \
/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;
as well as URLs for NNTP newsgroup(s).