Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / net / ipv6 / netfilter / ip6_tables.c

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index e080fbbbc0e5ce8d4d71014eed149e6b34250b62..412b3cfaaf6ef9a4c50777ce9582c318ff42d152 100644 (file)
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
 #endif
 
 static int get_info(struct net *net, void __user *user,
-                    const int *len, int compat)
+                    int len, int compat)
 {
        char name[XT_TABLE_MAXNAMELEN];
        struct xt_table *t;
        int ret;
 
-       if (*len != sizeof(struct ip6t_getinfo)) {
-               duprintf("length %u != %zu\n", *len,
+       if (len != sizeof(struct ip6t_getinfo)) {
+               duprintf("length %u != %zu\n", len,
                         sizeof(struct ip6t_getinfo));
                return -EINVAL;
        }
@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
                info.size = private->size;
                strcpy(info.name, name);
 
-               if (copy_to_user(user, &info, *len) != 0)
+               if (copy_to_user(user, &info, len) != 0)
                        ret = -EFAULT;
                else
                        ret = 0;
@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
 
        switch (cmd) {
        case IP6T_SO_GET_INFO:
-               ret = get_info(sock_net(sk), user, len, 1);
+               ret = get_info(sock_net(sk), user, *len, 1);
                break;
        case IP6T_SO_GET_ENTRIES:
                ret = compat_get_entries(sock_net(sk), user, len);
@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
 
        switch (cmd) {
        case IP6T_SO_GET_INFO:
-               ret = get_info(sock_net(sk), user, len, 0);
+               ret = get_info(sock_net(sk), user, *len, 0);
                break;
 
        case IP6T_SO_GET_ENTRIES: