netfilter/arp_tables: clean up compat {get, set}sockopt handling

Merge the native and compat {get,set}sockopt handlers using
in_compat_syscall().

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index b167f4a..15807fb 100644 (file)
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -787,8 +787,7 @@ 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)
+static int get_info(struct net *net, void __user *user, const int *len)
 {
        char name[XT_TABLE_MAXNAMELEN];
        struct xt_table *t;
@@ -802,7 +801,7 @@ static int get_info(struct net *net, void __user *user,
 
        name[XT_TABLE_MAXNAMELEN-1] = '\0';
 #ifdef CONFIG_COMPAT
-       if (compat)
+       if (in_compat_syscall())
                xt_compat_lock(NFPROTO_ARP);
 #endif
        t = xt_request_find_table_lock(net, NFPROTO_ARP, name);
@@ -812,7 +811,7 @@ static int get_info(struct net *net, void __user *user,
 #ifdef CONFIG_COMPAT
                struct xt_table_info tmp;
 
-               if (compat) {
+               if (in_compat_syscall()) {
                        ret = compat_table_info(private, &tmp);
                        xt_compat_flush_offsets(NFPROTO_ARP);
                        private = &tmp;
@@ -837,7 +836,7 @@ static int get_info(struct net *net, void __user *user,
        } else
                ret = PTR_ERR(t);
 #ifdef CONFIG_COMPAT
-       if (compat)
+       if (in_compat_syscall())
                xt_compat_unlock(NFPROTO_ARP);
 #endif
        return ret;
@@ -998,7 +997,7 @@ static int do_replace(struct net *net, const void __user *user,
 }
 
 static int do_add_counters(struct net *net, const void __user *user,
-                          unsigned int len, int compat)
+                          unsigned int len)
 {
        unsigned int i;
        struct xt_counters_info tmp;
@@ -1009,7 +1008,8 @@ static int do_add_counters(struct net *net, const void __user *user,
        struct arpt_entry *iter;
        unsigned int addend;
 
-       paddc = xt_copy_counters_from_user(user, len, &tmp, compat);
+       paddc = xt_copy_counters_from_user(user, len, &tmp,
+                                          in_compat_syscall());
        if (IS_ERR(paddc))
                return PTR_ERR(paddc);
 
@@ -1294,30 +1294,6 @@ static int compat_do_replace(struct net *net, void __user *user,
        return ret;
 }
 
-static int compat_do_arpt_set_ctl(struct sock *sk, int cmd, void __user *user,
-                                 unsigned int len)
-{
-       int ret;
-
-       if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN))
-               return -EPERM;
-
-       switch (cmd) {
-       case ARPT_SO_SET_REPLACE:
-               ret = compat_do_replace(sock_net(sk), user, len);
-               break;
-
-       case ARPT_SO_SET_ADD_COUNTERS:
-               ret = do_add_counters(sock_net(sk), user, len, 1);
-               break;
-
-       default:
-               ret = -EINVAL;
-       }
-
-       return ret;
-}
-
 static int compat_copy_entry_to_user(struct arpt_entry *e, void __user **dstptr,
                                     compat_uint_t *size,
                                     struct xt_counters *counters,
@@ -1425,29 +1401,6 @@ static int compat_get_entries(struct net *net,
        xt_compat_unlock(NFPROTO_ARP);
        return ret;
 }
-
-static int do_arpt_get_ctl(struct sock *, int, void __user *, int *);
-
-static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
-                                 int *len)
-{
-       int ret;
-
-       if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN))
-               return -EPERM;
-
-       switch (cmd) {
-       case ARPT_SO_GET_INFO:
-               ret = get_info(sock_net(sk), user, len, 1);
-               break;
-       case ARPT_SO_GET_ENTRIES:
-               ret = compat_get_entries(sock_net(sk), user, len);
-               break;
-       default:
-               ret = do_arpt_get_ctl(sk, cmd, user, len);
-       }
-       return ret;
-}
 #endif
 
 static int do_arpt_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)
@@ -1459,11 +1412,16 @@ static int do_arpt_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned
 
        switch (cmd) {
        case ARPT_SO_SET_REPLACE:
-               ret = do_replace(sock_net(sk), user, len);
+#ifdef CONFIG_COMPAT
+               if (in_compat_syscall())
+                       ret = compat_do_replace(sock_net(sk), user, len);
+               else
+#endif
+                       ret = do_replace(sock_net(sk), user, len);
                break;
 
        case ARPT_SO_SET_ADD_COUNTERS:
-               ret = do_add_counters(sock_net(sk), user, len, 0);
+               ret = do_add_counters(sock_net(sk), user, len);
                break;
 
        default:
@@ -1482,11 +1440,16 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
 
        switch (cmd) {
        case ARPT_SO_GET_INFO:
-               ret = get_info(sock_net(sk), user, len, 0);
+               ret = get_info(sock_net(sk), user, len);
                break;
 
        case ARPT_SO_GET_ENTRIES:
-               ret = get_entries(sock_net(sk), user, len);
+#ifdef CONFIG_COMPAT
+               if (in_compat_syscall())
+                       ret = compat_get_entries(sock_net(sk), user, len);
+               else
+#endif
+                       ret = get_entries(sock_net(sk), user, len);
                break;
 
        case ARPT_SO_GET_REVISION_TARGET: {
@@ -1610,15 +1573,9 @@ static struct nf_sockopt_ops arpt_sockopts = {
        .set_optmin     = ARPT_BASE_CTL,
        .set_optmax     = ARPT_SO_SET_MAX+1,
        .set            = do_arpt_set_ctl,
-#ifdef CONFIG_COMPAT
-       .compat_set     = compat_do_arpt_set_ctl,
-#endif
        .get_optmin     = ARPT_BASE_CTL,
        .get_optmax     = ARPT_SO_GET_MAX+1,
        .get            = do_arpt_get_ctl,
-#ifdef CONFIG_COMPAT
-       .compat_get     = compat_do_arpt_get_ctl,
-#endif
        .owner          = THIS_MODULE,
 };