From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76956C4320A for ; Thu, 5 Aug 2021 13:50:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 525876113C for ; Thu, 5 Aug 2021 13:50:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241322AbhHENui (ORCPT ); Thu, 5 Aug 2021 09:50:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:39824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233033AbhHENuh (ORCPT ); Thu, 5 Aug 2021 09:50:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 632FD6113B; Thu, 5 Aug 2021 13:50:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628171423; bh=nT1UWnENjBDcl40entDFb9eLWswm/nuKc503srol/vs=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=gIchlBOMqTDeBdHZTHenHuInKv3KPHn8Meym0knKTakBQy70DvHmNpoau1xhq17Xb pVr0TkUEe7oHjFXzveRVMD/lrUVnV2SY22MjBTTUjRd9NiG6I6nPZvZ8CcvZbKRgQD Kp1ouuwH8pn8IU3cE4EbO3Nqz6Ia9VHuPURg5TY6DfB+UEmvgpVCtPvUWZvqA3RQ2B ff7YfkJdPXdl059bjZ9uRUZvZm5lnCrIeowDDdL5tObHk6zgrlRxCNhT559wRqy0fa aV+4AZmbuUNlRYLEagzocbq32FRkU9dUZwVqTSi5bsWpeZyag7n5GMSJ1nWq2qEH0D BWQRarPdpMPPw== Date: Thu, 5 Aug 2021 06:50:22 -0700 From: Jakub Kicinski To: Takeshi Misawa Cc: David Howells , netdev@vger.kernel.org, Alexander Aring , Stefan Schmidt , linux-wpan@vger.kernel.org Subject: Re: [PATCH net] net: Fix memory leak in ieee802154_raw_deliver Message-ID: <20210805065022.574e0691@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <20210805075414.GA15796@DESKTOP> References: <20210805075414.GA15796@DESKTOP> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, 5 Aug 2021 16:54:14 +0900 Takeshi Misawa wrote: > If IEEE-802.15.4-RAW is closed before receive skb, skb is leaked. > Fix this, by freeing sk_receive_queue in sk->sk_destruct(). > > syzbot report: > BUG: memory leak > unreferenced object 0xffff88810f644600 (size 232): > comm "softirq", pid 0, jiffies 4294967032 (age 81.270s) > hex dump (first 32 bytes): > 10 7d 4b 12 81 88 ff ff 10 7d 4b 12 81 88 ff ff .}K......}K..... > 00 00 00 00 00 00 00 00 40 7c 4b 12 81 88 ff ff ........@|K..... > backtrace: > [] skb_clone+0xaa/0x2b0 net/core/skbuff.c:1496 > [] ieee802154_raw_deliver net/ieee802154/socket.c:369 [inline] > [] ieee802154_rcv+0x100/0x340 net/ieee802154/socket.c:1070 > [] __netif_receive_skb_one_core+0x6a/0xa0 net/core/dev.c:5384 > [] __netif_receive_skb+0x27/0xa0 net/core/dev.c:5498 > [] netif_receive_skb_internal net/core/dev.c:5603 [inline] > [] netif_receive_skb+0x59/0x260 net/core/dev.c:5662 > [] ieee802154_deliver_skb net/mac802154/rx.c:29 [inline] > [] ieee802154_subif_frame net/mac802154/rx.c:102 [inline] > [] __ieee802154_rx_handle_packet net/mac802154/rx.c:212 [inline] > [] ieee802154_rx+0x612/0x620 net/mac802154/rx.c:284 > [] ieee802154_tasklet_handler+0x86/0xa0 net/mac802154/main.c:35 > [] tasklet_action_common.constprop.0+0x5b/0x100 kernel/softirq.c:557 > [] __do_softirq+0xbf/0x2ab kernel/softirq.c:345 > [] do_softirq kernel/softirq.c:248 [inline] > [] do_softirq+0x5c/0x80 kernel/softirq.c:235 > [] __local_bh_enable_ip+0x51/0x60 kernel/softirq.c:198 > [] local_bh_enable include/linux/bottom_half.h:32 [inline] > [] rcu_read_unlock_bh include/linux/rcupdate.h:745 [inline] > [] __dev_queue_xmit+0x7f4/0xf60 net/core/dev.c:4221 > [] raw_sendmsg+0x1f4/0x2b0 net/ieee802154/socket.c:295 > [] sock_sendmsg_nosec net/socket.c:654 [inline] > [] sock_sendmsg+0x56/0x80 net/socket.c:674 > [] __sys_sendto+0x15c/0x200 net/socket.c:1977 > [] __do_sys_sendto net/socket.c:1989 [inline] > [] __se_sys_sendto net/socket.c:1985 [inline] > [] __x64_sys_sendto+0x26/0x30 net/socket.c:1985 > > Fixes: 9ec767160357 ("net: add IEEE 802.15.4 socket family implementation") > Reported-and-tested-by: syzbot+1f68113fa907bf0695a8@syzkaller.appspotmail.com > Signed-off-by: Takeshi Misawa > --- > Dear David Howells, Jakub Kicinski Please use scripts/get_maintainer.pl to find the people you should CC. Adding Alexander and Stefan. > syzbot reported memory leak in ieee802154_raw_deliver. > > I send a patch that passed syzbot reproducer test. > Please consider this memory leak and patch. > > syzbot link: > https://syzkaller.appspot.com/bug?id=8dd3bcb1dc757587adfb4dbb810fd24dd990283f > > Regards. > --- > net/ieee802154/socket.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c > index a45a0401adc5..c25f7617770c 100644 > --- a/net/ieee802154/socket.c > +++ b/net/ieee802154/socket.c > @@ -984,6 +984,11 @@ static const struct proto_ops ieee802154_dgram_ops = { > .sendpage = sock_no_sendpage, > }; > > +static void ieee802154_sock_destruct(struct sock *sk) > +{ > + skb_queue_purge(&sk->sk_receive_queue); > +} > + > /* Create a socket. Initialise the socket, blank the addresses > * set the state. > */ > @@ -1024,7 +1029,7 @@ static int ieee802154_create(struct net *net, struct socket *sock, > sock->ops = ops; > > sock_init_data(sock, sk); > - /* FIXME: sk->sk_destruct */ > + sk->sk_destruct = ieee802154_sock_destruct; > sk->sk_family = PF_IEEE802154; > > /* Checksums on by default */