projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fea199d
)
netfilter: nf_tables: out-of-bound check in chain blob
author
Pablo Neira Ayuso
<pablo@netfilter.org>
Tue, 6 Jun 2023 14:32:44 +0000
(16:32 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 14 Jun 2023 09:15:20 +0000
(11:15 +0200)
[ Upstream commit
08e42a0d3ad30f276f9597b591f975971a1b0fcf
]
Add current size of rule expressions to the boundary check.
Fixes:
2c865a8a28a1
("netfilter: nf_tables: add rule blob layout")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/netfilter/nf_tables_api.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nf_tables_api.c
b/net/netfilter/nf_tables_api.c
index
31775d5
..
437891c
100644
(file)
--- a/
net/netfilter/nf_tables_api.c
+++ b/
net/netfilter/nf_tables_api.c
@@
-8723,7
+8723,7
@@
static int nf_tables_commit_chain_prepare(struct net *net, struct nft_chain *cha
continue;
}
- if (WARN_ON_ONCE(data + expr->ops->size > data_boundary))
+ if (WARN_ON_ONCE(data +
size +
expr->ops->size > data_boundary))
return -ENOMEM;
memcpy(data + size, expr, expr->ops->size);