netfilter: nf_tables: validate family when identifying table via handle
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nf_tables: validate family when identifying table via handle
[ Upstream commit f6e1532a2697b81da00bfb184e99d15e01e9d98c ]
Validate table family when looking up for it via NFTA_TABLE_HANDLE.
--- net/netfilter/nf_tables_api.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +3 -2
@@ -536,7 +536,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;
@@ -544,6 +544,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; }
@@ -1189,7 +1190,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);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nf_tables: validate family when identifying table via handle
[ Upstream commit f6e1532a2697b81da00bfb184e99d15e01e9d98c ]
Validate table family when looking up for it via NFTA_TABLE_HANDLE.
--- net/netfilter/nf_tables_api.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +3 -2
@@ -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);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nf_tables: validate family when identifying table via handle
In reply to Pablo Neira Ayuso[ Upstream commit f6e1532a2697b81da00bfb184e99d15e01e9d98c ]
Validate table family when looking up for it via NFTA_TABLE_HANDLE.
--- net/netfilter/nf_tables_api.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +3 -2
@@ -713,7 +713,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;
@@ -721,6 +721,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; }
@@ -1440,7 +1441,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);
Signature · 1 line
2.30.2
Quoted 8 lines · 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 <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Queued up, thanks!
Signature · 2 lines
Thanks, Sasha