netfilter: ebtables: use array_size() helper in copy_{from,to}_user()
Subsystems (4)
PATCH 1/1 netfilter: ebtables: use array_size() helper in copy_{from,to}_user()
Use array_size() helper instead of the open-coded version in copy_{from,to}_user(). These sorts of multiplication factors need to be wrapped in array_size().
--- net/bridge/netfilter/ebtables.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/bridge/netfilter/ebtables.c +4 -3
@@ -1071,7 +1071,7 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl,*/ if (repl->num_counters &©_to_user (repl->counters, counterstmp, - repl->num_counters *sizeof (struct ebt_counter ))) { +array_size (repl->num_counters,sizeof (struct ebt_counter )))) {/* Silent error, can't fail, new table is already in place */ net_warn_ratelimited ("ebtables: counters copy to user failed while replacing table\n" ); }
@@ -1399,7 +1399,8 @@ static int do_update_counters(struct net *net, const char *name, goto unlock_mutex; } -if (copy_from_user (tmp, counters, num_counters *sizeof (*counters))) { +if (copy_from_user (tmp, counters, +array_size (num_counters,sizeof (*counters)))) { ret = -EFAULT ; goto unlock_mutex; }
@@ -1532,7 +1533,7 @@ static int copy_counters_to_user(struct ebt_table *t,write_unlock_bh (&t->lock);if (copy_to_user (user, counterstmp, - nentries *sizeof (struct ebt_counter ))) +array_size (nentries,sizeof (struct ebt_counter )))) ret = -EFAULT ;vfree (counterstmp);return ret;
Signature · 1 line
2.27.0
Quoted 6 lines · Gustavo A. R. Silva
Use
array_size()helper instead of the open-coded version in copy_{from,to}_user(). These sorts of multiplication factors need to be wrapped inarray_size().
Thanks!
I see that this is marked "Awaiting Upstream" (for an ebtables maintainer ack?)
https://patchwork.kernel.org/project/netdevbpf/patch/20210928200647.GA266402@embeddedor/
Signature · 1 line
Kees Cook
Pablo Neira Ayuso
maintainerQuoted 8 lines · Kees Cook
Quoted 6 lines · Gustavo A. R. Silva
Use
array_size()helper instead of the open-coded version in copy_{from,to}_user(). These sorts of multiplication factors need to be wrapped inarray_size().
Quoted 7 lines
Thanks!
Reviewed-by Kees Cook <[email protected]>I see that this is marked "Awaiting Upstream" (for an ebtables maintainer ack?)
https://patchwork.kernel.org/project/netdevbpf/patch/20210928200647.GA266402@embeddedor/
I'll route this through the netfilter tree, thanks.