From patchwork Thu Aug 3 18:31:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 1816633 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=nM8U74Uw; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RGyB213vZz1ybS for ; Fri, 4 Aug 2023 04:32:10 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qRd7E-00060C-SS; Thu, 03 Aug 2023 18:32:04 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qRd7E-0005zp-8F for kernel-team@lists.ubuntu.com; Thu, 03 Aug 2023 18:32:04 +0000 Received: from localhost.localdomain (1.general.cascardo.us.vpn [10.172.70.58]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 309D5414E8 for ; Thu, 3 Aug 2023 18:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1691087524; bh=Il8N4soAzTIGHVlINOQwQOW7AmkN5nVVb9Dccp2Y4Xk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nM8U74Uwak5B/ilRJCQLX37mKhnrVpi4RVnlzkL5xEGQbXv9ZOWB2BTykm4egzY1g 8fQWBXAL9uJV5JlxwF15gpAN23DQ2MsqCFd757sJVGrZUENbwhNev2ueTx69i5bUxt 3z8gnDAs+sJ3OV5FLSpI5clUzAXD3ij4FkNTgk9YVKUSxxKiWLqmEF6yxCl9tFlKRd XESo28eWvV/orNJ9QfP2gOc3h6yHYV6iyl0ZIW+OxhLwoT6LXEwknuR7GGO1M/bPpD l0l9q75OeRDvBcrylOy5TDGMoSqS33p2lVc8fhTMwD8BgtGrv5KgRbBzA8YBrx9qAy 2+5Szj5WSl5pA== From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [Jammy, OEM-5.17, OEM-6.0, Lunar 3/3] netfilter: nf_tables: unbind non-anonymous set if rule construction fails Date: Thu, 3 Aug 2023 15:31:03 -0300 Message-Id: <20230803183103.676567-5-cascardo@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230803183103.676567-1-cascardo@canonical.com> References: <20230803183103.676567-1-cascardo@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Pablo Neira Ayuso Otherwise a dangling reference to a rule object that is gone remains in the set binding list. Fixes: 26b5a5712eb8 ("netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain") Signed-off-by: Pablo Neira Ayuso (cherry picked from commit 3e70489721b6c870252c9082c496703677240f53) CVE-2023-4015 Signed-off-by: Thadeu Lima de Souza Cascardo --- net/netfilter/nf_tables_api.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index c38658b7491f..329ed9138b4f 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -5077,6 +5077,8 @@ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set, nft_set_trans_unbind(ctx, set); if (nft_set_is_anonymous(set)) nft_deactivate_next(ctx->net, set); + else + list_del_rcu(&binding->list); set->use--; break;