Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3832471pxv; Mon, 28 Jun 2021 14:07:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxN8jQ6XFrY+AgfbuB36S9UeUFCEFwUaVa48xeKZHgTMYRBOiA91IDIthAX6j2Dxd+VN9JK X-Received: by 2002:a92:a005:: with SMTP id e5mr4114866ili.22.1624914477207; Mon, 28 Jun 2021 14:07:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624914477; cv=none; d=google.com; s=arc-20160816; b=y2iSHW8fEOioUCNiwlm3wVWllCxGQ0N9paIS0UdFq9NLD1stG57u1aONLSKAPmcxxZ uSXCdsgaipw4GNc/j6FfHRNsMkt87RL/z4HT2YdxkLvnI1/3skxohj27RLQUv45bAMeV ogdVSzm1iWzBCztnw1EgxjX7V3vl+jdm8Yv9WdANgR6Yf3GgsEuWTonVvkOWQIBUQMeX KI72viIbSIk2pUsDRK+oxSJHidwJKithLQLOZS05y8yKF8TwlvI//1dMC3QhPpVQYn+4 IEalm0uchOq6nFzSClH6IhAVNBkbqpWNHF07wsSmcDpQ4XkdLZ7d6VLuifANIViLqTiK ov+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tTGycvn4QqPsDQrzp1DKI6n7Y78qc0GntU4JF2FnqvM=; b=eY6kPysJlvaSJA2rj1OwfiiQeuLKQbiAAsAQK+Ynf+krh1RpaxjN3KK5bGM6Ozwc6Z LAv7DuE/YTZT/ZFrzYITLp/jLEv86rIpdsvTmyMb4MtK+yICMAgazD6nIEPu/HSGE2oI iBWRErjvMqG+1CTaMqETVlOV4rX4WQOFu7jq7cgasflR39ckQ1ZYvHU7nnGeMz9GJ0rk GJtqh4gi7reCa5sxWYIwzEM5EmjaCInnbPYuXE/OK22Mme/YXyeQxy95wNemumHCJ3/x lLP03WJtn0ZWeCrYReduFZN+sHISHq8Vh5AP2c59bZvYKjPbVKhNmkp7CCk8V2aIt8NS Oq0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ou17YHRb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l17si13960531jas.38.2021.06.28.14.07.42; Mon, 28 Jun 2021 14:07:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ou17YHRb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236600AbhF1PLp (ORCPT + 99 others); Mon, 28 Jun 2021 11:11:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:55610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235041AbhF1OuY (ORCPT ); Mon, 28 Jun 2021 10:50:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BB86661D28; Mon, 28 Jun 2021 14:36:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624891020; bh=kZjPQ1qXQ9GTM2vYkbMfiKy/TF3j9K81aGd050X6QY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ou17YHRbsDpiENNKpsx4isjDTWPg3I1RiIYXjFAN5s3+LWm9zUKlR86imHkgduE/o OX6rTGuD1vgB4xnmy5PY4QIPSqvyxunPcRZeT5IX1zi4iSXazDuBAIE7K+CXVhgjIT 8dQlYzlTzNtJyMZslX8crM4BTX3Zkvm/kytqGgYLGquNMOkR/ZGEg/tKL7ExHVyWWX Wya2Bn7MCpfR0uqao8ruxJ2AdgsVMP5Sf0N6BXf+RD5s4GmTZZ+UYMI7PZaUvGUfbq xZwrmofUwIyyMtoXijaNeCIkyQEpBeNUCNnDkBPD0zIiLtJ35M45ODqIX5qrwQ5JQv 5f5lYyeji3SvA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chengyang Fan , Hulk Robot , Hangbin Liu , "David S . Miller" , Sasha Levin Subject: [PATCH 4.14 34/88] net: ipv4: fix memory leak in ip_mc_add1_src Date: Mon, 28 Jun 2021 10:35:34 -0400 Message-Id: <20210628143628.33342-35-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210628143628.33342-1-sashal@kernel.org> References: <20210628143628.33342-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.238-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.14.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.14.238-rc1 X-KernelTest-Deadline: 2021-06-30T14:36+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chengyang Fan [ Upstream commit d8e2973029b8b2ce477b564824431f3385c77083 ] BUG: memory leak unreferenced object 0xffff888101bc4c00 (size 32): comm "syz-executor527", pid 360, jiffies 4294807421 (age 19.329s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 01 00 00 00 00 00 00 00 ac 14 14 bb 00 00 02 00 ................ backtrace: [<00000000f17c5244>] kmalloc include/linux/slab.h:558 [inline] [<00000000f17c5244>] kzalloc include/linux/slab.h:688 [inline] [<00000000f17c5244>] ip_mc_add1_src net/ipv4/igmp.c:1971 [inline] [<00000000f17c5244>] ip_mc_add_src+0x95f/0xdb0 net/ipv4/igmp.c:2095 [<000000001cb99709>] ip_mc_source+0x84c/0xea0 net/ipv4/igmp.c:2416 [<0000000052cf19ed>] do_ip_setsockopt net/ipv4/ip_sockglue.c:1294 [inline] [<0000000052cf19ed>] ip_setsockopt+0x114b/0x30c0 net/ipv4/ip_sockglue.c:1423 [<00000000477edfbc>] raw_setsockopt+0x13d/0x170 net/ipv4/raw.c:857 [<00000000e75ca9bb>] __sys_setsockopt+0x158/0x270 net/socket.c:2117 [<00000000bdb993a8>] __do_sys_setsockopt net/socket.c:2128 [inline] [<00000000bdb993a8>] __se_sys_setsockopt net/socket.c:2125 [inline] [<00000000bdb993a8>] __x64_sys_setsockopt+0xba/0x150 net/socket.c:2125 [<000000006a1ffdbd>] do_syscall_64+0x40/0x80 arch/x86/entry/common.c:47 [<00000000b11467c4>] entry_SYSCALL_64_after_hwframe+0x44/0xae In commit 24803f38a5c0 ("igmp: do not remove igmp souce list info when set link down"), the ip_mc_clear_src() in ip_mc_destroy_dev() was removed, because it was also called in igmpv3_clear_delrec(). Rough callgraph: inetdev_destroy -> ip_mc_destroy_dev -> igmpv3_clear_delrec -> ip_mc_clear_src -> RCU_INIT_POINTER(dev->ip_ptr, NULL) However, ip_mc_clear_src() called in igmpv3_clear_delrec() doesn't release in_dev->mc_list->sources. And RCU_INIT_POINTER() assigns the NULL to dev->ip_ptr. As a result, in_dev cannot be obtained through inetdev_by_index() and then in_dev->mc_list->sources cannot be released by ip_mc_del1_src() in the sock_close. Rough call sequence goes like: sock_close -> __sock_release -> inet_release -> ip_mc_drop_socket -> inetdev_by_index -> ip_mc_leave_src -> ip_mc_del_src -> ip_mc_del1_src So we still need to call ip_mc_clear_src() in ip_mc_destroy_dev() to free in_dev->mc_list->sources. Fixes: 24803f38a5c0 ("igmp: do not remove igmp souce list info ...") Reported-by: Hulk Robot Signed-off-by: Chengyang Fan Acked-by: Hangbin Liu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv4/igmp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index b6f0ee01f2e0..a6b048ff30e6 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -1790,6 +1790,7 @@ void ip_mc_destroy_dev(struct in_device *in_dev) while ((i = rtnl_dereference(in_dev->mc_list)) != NULL) { in_dev->mc_list = i->next_rcu; in_dev->mc_count--; + ip_mc_clear_src(i); ip_ma_put(i); } } -- 2.30.2