Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp775046rwb; Mon, 26 Sep 2022 05:50:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7U6vp9oj8Erz04lIRB8otvM6XnGuKwjoPBGfcYiJcTg4g/cgtbkb9EzUzT5vrKEU5TG7vf X-Received: by 2002:a17:90b:384b:b0:200:71b8:ae00 with SMTP id nl11-20020a17090b384b00b0020071b8ae00mr35718336pjb.125.1664196610840; Mon, 26 Sep 2022 05:50:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664196610; cv=none; d=google.com; s=arc-20160816; b=eOiumwmp45+/mp20Ak9rbzbY5SrghlqvPpmT2RuGmHxQEL48dK0D30lnWBAuEZnLZx 2XpqDdHnSH4/Eqrh2XJdAs4hpqFIWXP/nJpePFlqCz9o6hmcptSamLDKyQWNQAdAH+vK e2wwfu54LUGcYvwJDcHGlXToj6cn6FasVAneEnbCe0v4mewoIW+LTpk8rtdtIMnhS0eK FMVKYGyPGYo7d5YsMrkJr0KQsepmCnaN00RVONrX1e//OmlhYwRIiirNZPEc3UA/jJDD sYA5h60WDKwmYHlDJ5zx28wJKvHEgq/Lj6JgWi5jlVPqt+g+gwJXzFdwCnedSkT5XdrG JjdQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JQIJgqpRBmmESVFIKMhuQJSglhpFxnOwjmkv5dzzyfQ=; b=mAtqCQYZgcbt3VGtwgZLa6tknEgZvt/IlQr8DaeejtDuiPRHkMt6gs16OvTDVO1UmC FZ+KCUoDTDfKrCTDR+9xo52duhAIKIKz1AEydPzc7h96OzEaPeZY3z2blAYsqgeLDTcb i3j+6r3VyqXLYtBrkrx9GaIvsSNklGw0eSnOrwMhaLwE15C7/oHCwJmjBFwCV0FqrDNt JNnwwvTHvP5qt5l+lQ/qdGBg7jBMsja0fRdVIpkozG1tC1BzUj5qWPJXwtfQL7kDg4Bc AuxJUcCfl5dCw6CSeBY4rVWty3dfelOufjDbdFmSSJMhXFFMXPPKy125NHs5I4JSabwb KVUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vVfaXDyX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r124-20020a632b82000000b0043c700ff7f6si8770150pgr.721.2022.09.26.05.49.58; Mon, 26 Sep 2022 05:50:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vVfaXDyX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237835AbiIZLYx (ORCPT + 99 others); Mon, 26 Sep 2022 07:24:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231727AbiIZLXa (ORCPT ); Mon, 26 Sep 2022 07:23:30 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EB4CE0E5; Mon, 26 Sep 2022 03:39:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0895060C0B; Mon, 26 Sep 2022 10:38:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 126E6C433D6; Mon, 26 Sep 2022 10:38:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1664188722; bh=T5PF9Z5HInciAt1NoxqJnOZA+Y+OU/V35RoIsjOjHXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vVfaXDyX0pHXQc/XGj7UxCMPJcvQrjSeFyaBuxabc9GbbqIdRCynTJJHcb3uV/U+1 R1clnbmd6QxSbrvI+TJwzuq9IxR4z1JSrM/9BBzp4BpoFkNUzRaoFuFfxF1h68hsFv 7udYh8EeBbFqSbhdqj2ObxTaYzUOWZ9GTgeLXpBg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tetsuo Handa , Florian Westphal , Sasha Levin Subject: [PATCH 5.15 101/148] netfilter: nf_tables: fix percpu memory leak at nf_tables_addchain() Date: Mon, 26 Sep 2022 12:12:15 +0200 Message-Id: <20220926100759.874916140@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926100756.074519146@linuxfoundation.org> References: <20220926100756.074519146@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tetsuo Handa [ Upstream commit 9a4d6dd554b86e65581ef6b6638a39ae079b17ac ] It seems to me that percpu memory for chain stats started leaking since commit 3bc158f8d0330f0a ("netfilter: nf_tables: map basechain priority to hardware priority") when nft_chain_offload_priority() returned an error. Signed-off-by: Tetsuo Handa Fixes: 3bc158f8d0330f0a ("netfilter: nf_tables: map basechain priority to hardware priority") Signed-off-by: Florian Westphal Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_api.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index d8e66467c06c..460ad341d160 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2148,6 +2148,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask, if (err < 0) { nft_chain_release_hook(&hook); kfree(basechain); + free_percpu(stats); return err; } if (stats) -- 2.35.1