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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 5B89AC2D0DB for ; Fri, 24 Jan 2020 14:20:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2457021556 for ; Fri, 24 Jan 2020 14:20:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875649; bh=NI/F5O7O2DF5NpXDqVbwR4mY4CXCuJUdj3rgTc4J27Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MAlXaA8TBuQODrTOrdCNgolGN3oGybxKMxInliBtpCPEWRY5QbBGxYT/C9U1DwimK vk0QX8QUMf37SLFFfQT/+EeHDdDZJyhmCPjDmKqw3vS+O2gADpEztSUCpa1tGB3lvV zqO322Ja/YdfPBkFt1GwaawynquMEricL5LLFodk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405054AbgAXOUs (ORCPT ); Fri, 24 Jan 2020 09:20:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:42132 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405041AbgAXOUr (ORCPT ); Fri, 24 Jan 2020 09:20:47 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8925B24658; Fri, 24 Jan 2020 14:20:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875646; bh=NI/F5O7O2DF5NpXDqVbwR4mY4CXCuJUdj3rgTc4J27Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nBL8+tSQLRK7uTMzkirJvnO7VISgs+2nkwG+jt2VPD1wWiMGoNgziu5USvlfdog/E xCug6wUALA3zq8jZntffeh2ZpaeO0Veo3Sk/W8vZnbmliT6T42xFyINDfWNc2HwqH8 SiIXQJafRD97xFRiO3clPSt/uYGEuMwEbvFJhKaE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Cong Wang , syzbot+4c3cc6dbe7259dbf9054@syzkaller.appspotmail.com, Jozsef Kadlecsik , Pablo Neira Ayuso , Sasha Levin , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 29/56] netfilter: fix a use-after-free in mtype_destroy() Date: Fri, 24 Jan 2020 09:19:45 -0500 Message-Id: <20200124142012.29752-29-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124142012.29752-1-sashal@kernel.org> References: <20200124142012.29752-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Cong Wang [ Upstream commit c120959387efa51479056fd01dc90adfba7a590c ] map->members is freed by ip_set_free() right before using it in mtype_ext_cleanup() again. So we just have to move it down. Reported-by: syzbot+4c3cc6dbe7259dbf9054@syzkaller.appspotmail.com Fixes: 40cd63bf33b2 ("netfilter: ipset: Support extensions which need a per data destroy function") Acked-by: Jozsef Kadlecsik Signed-off-by: Cong Wang Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/ipset/ip_set_bitmap_gen.h b/net/netfilter/ipset/ip_set_bitmap_gen.h index 257ca393e6f22..af480ffefaf32 100644 --- a/net/netfilter/ipset/ip_set_bitmap_gen.h +++ b/net/netfilter/ipset/ip_set_bitmap_gen.h @@ -64,9 +64,9 @@ mtype_destroy(struct ip_set *set) if (SET_WITH_TIMEOUT(set)) del_timer_sync(&map->gc); - ip_set_free(map->members); if (set->dsize && set->extensions & IPSET_EXT_DESTROY) mtype_ext_cleanup(set); + ip_set_free(map->members); ip_set_free(map); set->data = NULL; -- 2.20.1