fix iptables __user misannotations
Subsystems (2)
PATCH 1/1 fix iptables __user misannotations
Signed-off-by Al Viro <[email protected]>
--- include/linux/netfilter/x_tables.h | 4 ++-- net/ipv4/netfilter/ip_tables.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
include/linux/netfilter/x_tables.h +2 -2
@@ -390,13 +390,13 @@ extern int xt_compat_match_offset(structextern void xt_compat_match_from_user (struct xt_entry_match *m,void **dstptr,int *size);extern int xt_compat_match_to_user (struct xt_entry_match *m, -void *__user *dstptr,int *size); +void __user **dstptr,int *size);extern int xt_compat_target_offset (struct xt_target *target);extern void xt_compat_target_from_user (struct xt_entry_target *t,void **dstptr,int *size);extern int xt_compat_target_to_user (struct xt_entry_target *t, -void *__user *dstptr,int *size); +void __user **dstptr,int *size);#endif /* CONFIG_COMPAT */ #endif /* __KERNEL__ */
net/ipv4/netfilter/ip_tables.c +3 -3
@@ -1364,15 +1364,15 @@ struct compat_ipt_replace { };static inline int compat_copy_match_to_user (struct ipt_entry_match *m, -void *__user *dstptr,compat_uint_t *size) +void __user **dstptr,compat_uint_t *size) {return xt_compat_match_to_user (m, dstptr, size); }static int compat_copy_entry_to_user (struct ipt_entry *e, -void *__user *dstptr,compat_uint_t *size) +void __user **dstptr,compat_uint_t *size) { -struct ipt_entry_target __user *t; +struct ipt_entry_target *t;struct compat_ipt_entry __user *ce;u_int16_t target_offset, next_offset;compat_uint_t origsize;
Signature · 1 line
1.4.2.GIT