]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat...
authorPatrick McHardy <kaber@trash.net>
Thu, 4 May 2006 06:20:27 +0000 (23:20 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 May 2006 06:20:27 +0000 (23:20 -0700)
Noticed by Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/netfilter/ip_tables.c
net/netfilter/x_tables.c

index 6d1c11563943f1cdfa35fcded77e30f5d0b14c02..cee3397ec27765dcdeab77890847ac59b2cb2434 100644 (file)
@@ -1441,7 +1441,7 @@ static int compat_copy_entry_to_user(struct ipt_entry *e,
        ret = -EFAULT;
        origsize = *size;
        ce = (struct compat_ipt_entry __user *)*dstptr;
-       if (__copy_to_user(ce, e, sizeof(struct ipt_entry)))
+       if (copy_to_user(ce, e, sizeof(struct ipt_entry)))
                goto out;
 
        *dstptr += sizeof(struct compat_ipt_entry);
@@ -1459,9 +1459,9 @@ static int compat_copy_entry_to_user(struct ipt_entry *e,
                goto out;
        ret = -EFAULT;
        next_offset = e->next_offset - (origsize - *size);
-       if (__put_user(target_offset, &ce->target_offset))
+       if (put_user(target_offset, &ce->target_offset))
                goto out;
-       if (__put_user(next_offset, &ce->next_offset))
+       if (put_user(next_offset, &ce->next_offset))
                goto out;
        return 0;
 out:
index 17abf60f957003f3e9f3df5904f6255c8995e93b..99293c63ff7348c71c38c9eaf3a3406876a0a3f3 100644 (file)
@@ -289,7 +289,7 @@ int xt_compat_match(void *match, void **dstptr, int *size, int convert)
                case COMPAT_TO_USER:
                        pm = (struct xt_entry_match *)match;
                        msize = pm->u.user.match_size;
-                       if (__copy_to_user(*dstptr, pm, msize)) {
+                       if (copy_to_user(*dstptr, pm, msize)) {
                                ret = -EFAULT;
                                break;
                        }
@@ -366,7 +366,7 @@ int xt_compat_target(void *target, void **dstptr, int *size, int convert)
                case COMPAT_TO_USER:
                        pt = (struct xt_entry_target *)target;
                        tsize = pt->u.user.target_size;
-                       if (__copy_to_user(*dstptr, pt, tsize)) {
+                       if (copy_to_user(*dstptr, pt, tsize)) {
                                ret = -EFAULT;
                                break;
                        }