Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2877113rwb; Mon, 15 Aug 2022 13:07:58 -0700 (PDT) X-Google-Smtp-Source: AA6agR62p3KDPDYg2SfbVh5BhbT0OcHd8/bc0RlxyoMdRLw+ok+oB4Gwmmmphohc4weMbB66MnVQ X-Received: by 2002:a05:6402:3408:b0:43c:2dd3:d86b with SMTP id k8-20020a056402340800b0043c2dd3d86bmr15982601edc.108.1660594078038; Mon, 15 Aug 2022 13:07:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660594078; cv=none; d=google.com; s=arc-20160816; b=F/OBCHAub9ayUqcSdnK8Jx5u535WO+I0MZzpT701ENu/AtGV7TqK2yPgVcf3lSP6o6 2QlCO6zhD6c9qCAoWqVfQwXlNo1E+VxiponWMlnO6CKxrbFtnG5lIVyXGTXMiQ+u6qpv 5RRwl6LkaTZcgrZfF9myRuJHyJffXuNyFA9dek0Nf6M5mI7etMz4jYVjhBQgGH6r1g2l 2uHa4ANJ5jXCRmjBt9pse4rKtGObWVJQTrX20rV2nVgOQ0qpknCuvCa+8N4SvBVcFn4A GKZRrrgOjIuvRGYrLIl/YehoTYt/rIJ50swZWVw7Nqyn2sz8A3NOWhtO2M0pgkzQZlyE b1gQ== 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=Nsam6FN8/qlclduRFBZ6dtEl/+9tPOZm6jOIuvq9jIY=; b=o+maNBN5nVy8zq7hiE83nJZuTbYETHFPByB5zyl0Rwx7mPdaoNpE0k7k9lv6m1YdKo anIG5TnfSWSybbYUvHVfDkrrF55koxXbJBQYAgdQ7ZmvzxLjAGrCBsi0uUj28RWF4L2R ZcVACe2Z2ombHAmjRxCndPiUDstsL/hjMPggv1K7kXVGWxmleSL8HW39ZfvlcULIf5zq zh+y/zDetvgOrbXBjxdRUHA4MDXCuv0rbNUgtJ5MkF3FFig699iAoMt6/9gfcMHCq692 sViraLXAYk4aQVb7HjlEpxgaK3DoMbOFwC5nx/63ZJGwFhQcLFmOe9DEW9JC6eej2+5J u2yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IiK1fLZL; 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 nc20-20020a1709071c1400b00734b96e0c80si9335732ejc.690.2022.08.15.13.07.30; Mon, 15 Aug 2022 13:07:58 -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=IiK1fLZL; 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 S242201AbiHOS2X (ORCPT + 99 others); Mon, 15 Aug 2022 14:28:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242010AbiHOSZs (ORCPT ); Mon, 15 Aug 2022 14:25:48 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 391672BEA; Mon, 15 Aug 2022 11:18:55 -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 ams.source.kernel.org (Postfix) with ESMTPS id 74A76B81063; Mon, 15 Aug 2022 18:18:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0B3AC433C1; Mon, 15 Aug 2022 18:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660587511; bh=SSdxrt6SaLn3uYwefwPyPC+2wEBxa+Rwk3ncl4tY+FE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IiK1fLZLKr6cL8FE8zKDHx2NMSJIrQiY/mxQnb3ffRbLvwW8IFFomWfEmVN8g0hSQ ZIfsh9bx5GweVXBybcll8o8xAloUANgBKu5bD+DkjS8FJh4DKIT1+U0ATweVA4jD19 YWSZI5Su0CJHw9jzOesXAE4Y8+ksAwDg5zqDF2Uw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thadeu Lima de Souza Cascardo , Pablo Neira Ayuso Subject: [PATCH 5.15 107/779] netfilter: nf_tables: do not allow CHAIN_ID to refer to another table Date: Mon, 15 Aug 2022 19:55:51 +0200 Message-Id: <20220815180341.897318476@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180337.130757997@linuxfoundation.org> References: <20220815180337.130757997@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.1 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,T_SCC_BODY_TEXT_LINE 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: Thadeu Lima de Souza Cascardo commit 95f466d22364a33d183509629d0879885b4f547e upstream. When doing lookups for chains on the same batch by using its ID, a chain from a different table can be used. If a rule is added to a table but refers to a chain in a different table, it will be linked to the chain in table2, but would have expressions referring to objects in table1. Then, when table1 is removed, the rule will not be removed as its linked to a chain in table2. When expressions in the rule are processed or removed, that will lead to a use-after-free. When looking for chains by ID, use the table that was used for the lookup by name, and only return chains belonging to that same table. Fixes: 837830a4b439 ("netfilter: nf_tables: add NFTA_RULE_CHAIN_ID attribute") Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nf_tables_api.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2377,6 +2377,7 @@ err: } static struct nft_chain *nft_chain_lookup_byid(const struct net *net, + const struct nft_table *table, const struct nlattr *nla) { struct nftables_pernet *nft_net = nft_pernet(net); @@ -2387,6 +2388,7 @@ static struct nft_chain *nft_chain_looku struct nft_chain *chain = trans->ctx.chain; if (trans->msg_type == NFT_MSG_NEWCHAIN && + chain->table == table && id == nft_trans_chain_id(trans)) return chain; } @@ -3320,7 +3322,7 @@ static int nf_tables_newrule(struct sk_b return -EOPNOTSUPP; } else if (nla[NFTA_RULE_CHAIN_ID]) { - chain = nft_chain_lookup_byid(net, nla[NFTA_RULE_CHAIN_ID]); + chain = nft_chain_lookup_byid(net, table, nla[NFTA_RULE_CHAIN_ID]); if (IS_ERR(chain)) { NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_CHAIN_ID]); return PTR_ERR(chain); @@ -9451,7 +9453,7 @@ static int nft_verdict_init(const struct tb[NFTA_VERDICT_CHAIN], genmask); } else if (tb[NFTA_VERDICT_CHAIN_ID]) { - chain = nft_chain_lookup_byid(ctx->net, + chain = nft_chain_lookup_byid(ctx->net, ctx->table, tb[NFTA_VERDICT_CHAIN_ID]); if (IS_ERR(chain)) return PTR_ERR(chain);