From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 692E8185E6B; Wed, 3 Jul 2024 10:55:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720004154; cv=none; b=s145L1u8FHd+QhyN014zT8gqA1kwsavkzcmzDafT27yYrXd4LfyxnURkkGpUO16EPGoPRw3TkJmHUvLw/DFKGxeHQo4wN5jwHW25/Na+1J3z2F9N4eZ1mwm10TNlX8Ps2N9xMcHRjzlsYRBwCzvE7GzME6JbNfNkr0gThTkEF+E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720004154; c=relaxed/simple; bh=F+xidPXdWG8VPnGE1s5zI4EW6VyJIH3ntJIumqLsqkA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RrKaC2fqPvD+PCOoAMHOjSlF8d6TZBmavhL7AK43wDoLMWJl080GsL0H/VLJ+6/gqS4V1XlW7xbra261bGAefatR/24bUxp3fSLPJdicEpcU0le+Oo3ucSsavQcs126YJgsiu9IbURhiZ4OFa7qduXzl66+0BjbNeedWeS/U1XY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lfKoTik3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lfKoTik3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95A1EC32781; Wed, 3 Jul 2024 10:55:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720004154; bh=F+xidPXdWG8VPnGE1s5zI4EW6VyJIH3ntJIumqLsqkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lfKoTik3XOwc3mHtwZGkNFFXzKYhp7SldUXU1plci9jgq4/Lix1BkacDHeJW4owuu VOT1pAmhtefmMh770WnrM407q2O9eGOlfopCMwGxMYe7w/fzVz92u+OFTu0HMTVZ4U sgEq1YjhsVeh9ywUWi1p4s5dIg9+pZzuI/p3WttA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xingyuan Mo , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.4 139/189] netfilter: nf_tables: validate family when identifying table via handle Date: Wed, 3 Jul 2024 12:40:00 +0200 Message-ID: <20240703102846.728503416@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240703102841.492044697@linuxfoundation.org> References: <20240703102841.492044697@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pablo Neira Ayuso [ Upstream commit f6e1532a2697b81da00bfb184e99d15e01e9d98c ] Validate table family when looking up for it via NFTA_TABLE_HANDLE. Fixes: 3ecbfd65f50e ("netfilter: nf_tables: allocate handle and delete objects via handle") Reported-by: Xingyuan Mo Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_api.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 8131d858f38d9..44d4d97b45d13 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -553,7 +553,7 @@ static struct nft_table *nft_table_lookup(const struct net *net, static struct nft_table *nft_table_lookup_byhandle(const struct net *net, const struct nlattr *nla, - u8 genmask) + int family, u8 genmask) { struct nftables_pernet *nft_net; struct nft_table *table; @@ -561,6 +561,7 @@ static struct nft_table *nft_table_lookup_byhandle(const struct net *net, nft_net = net_generic(net, nf_tables_net_id); list_for_each_entry(table, &nft_net->tables, list) { if (be64_to_cpu(nla_get_be64(nla)) == table->handle && + table->family == family && nft_active_genmask(table, genmask)) return table; } @@ -1243,7 +1244,7 @@ static int nf_tables_deltable(struct net *net, struct sock *nlsk, if (nla[NFTA_TABLE_HANDLE]) { attr = nla[NFTA_TABLE_HANDLE]; - table = nft_table_lookup_byhandle(net, attr, genmask); + table = nft_table_lookup_byhandle(net, attr, family, genmask); } else { attr = nla[NFTA_TABLE_NAME]; table = nft_table_lookup(net, attr, family, genmask); -- 2.43.0