Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

xtables: use match, target and data copy_to_user helpers in compat

Browse Source 
Convert compat to copying entries, matches and targets one by one,
using the xt_match_to_user and xt_target_to_user helper functions.

Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Willem de Bruijn 2017-01-02 17:19:45 -05:00 committed by Pablo Neira Ayuso
parent b5040f6c33
commit 4915f7bbc4
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/netfilter/x_tables.c
View File

@ -619,17 +619,14 @@ int xt_compat_match_to_user(const struct xt_entry_match *m,
int off = xt_compat_match_offset(match); int off = xt_compat_match_offset(match);
u_int16_t msize = m->u.user.match_size - off; u_int16_t msize = m->u.user.match_size - off;
if (copy_to_user(cm, m, sizeof(*cm)) || if (XT_OBJ_TO_USER(cm, m, match, msize))
put_user(msize, &cm->u.user.match_size) ||
copy_to_user(cm->u.user.name, m->u.kernel.match->name,
strlen(m->u.kernel.match->name) + 1))
return -EFAULT; return -EFAULT;
if (match->compat_to_user) { if (match->compat_to_user) {
if (match->compat_to_user((void __user *)cm->data, m->data)) if (match->compat_to_user((void __user *)cm->data, m->data))
return -EFAULT; return -EFAULT;
} else { } else {
if (copy_to_user(cm->data, m->data, msize - sizeof(*cm))) if (XT_DATA_TO_USER(cm, m, match, msize - sizeof(*cm)))
return -EFAULT; return -EFAULT;
} }
@ -977,17 +974,14 @@ int xt_compat_target_to_user(const struct xt_entry_target *t,
int off = xt_compat_target_offset(target); int off = xt_compat_target_offset(target);
u_int16_t tsize = t->u.user.target_size - off; u_int16_t tsize = t->u.user.target_size - off;
if (copy_to_user(ct, t, sizeof(*ct)) || if (XT_OBJ_TO_USER(ct, t, target, tsize))
put_user(tsize, &ct->u.user.target_size) ||
copy_to_user(ct->u.user.name, t->u.kernel.target->name,
strlen(t->u.kernel.target->name) + 1))
return -EFAULT; return -EFAULT;
if (target->compat_to_user) { if (target->compat_to_user) {
if (target->compat_to_user((void __user *)ct->data, t->data)) if (target->compat_to_user((void __user *)ct->data, t->data))
return -EFAULT; return -EFAULT;
} else { } else {
if (copy_to_user(ct->data, t->data, tsize - sizeof(*ct))) if (XT_DATA_TO_USER(ct, t, target, tsize - sizeof(*ct)))
return -EFAULT; return -EFAULT;
} }