[PATCH] fix iptables __user misannotations
authorAl Viro <viro@ftp.linux.org.uk>
Sun, 24 Sep 2006 22:42:20 +0000 (23:42 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 24 Sep 2006 22:55:03 +0000 (15:55 -0700)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/linux/netfilter/x_tables.h
net/ipv4/netfilter/ip_tables.c

index 739a98eebe2c2c1f5b46cbbbeb6d19f3731ea91f..04319a76103aca92fa0092b6d152a61bb0d1b514 100644 (file)
@@ -390,13 +390,13 @@ extern int xt_compat_match_offset(struct xt_match *match);
 extern 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__ */
index 800067d69a9ac8a421184a6f9c0abaf6d5453013..78a44b01c03516bf18aecd65b7191800c42da947 100644 (file)
@@ -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;