netfilter: drop outermost socket lock in getsockopt()

[pandora-kernel.git] / net / ipv4 / ip_sockglue.c

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index b3648bb..ff4dd68 100644 (file)
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -1009,7 +1009,8 @@ e_inval:
  */
 int ip_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
  */
 int ip_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {

-       if (!(inet_sk(sk)->cmsg_flags & IP_CMSG_PKTINFO))
+       if (!(inet_sk(sk)->cmsg_flags & IP_CMSG_PKTINFO) &&
+           !IPCB(skb)->opt.optlen)

                skb_dst_drop(skb);
        return sock_queue_rcv_skb(sk, skb);
 }
                skb_dst_drop(skb);
        return sock_queue_rcv_skb(sk, skb);
 }


@@ -1029,11 +1030,8 @@ int ip_setsockopt(struct sock *sk, int level,
        if (err == -ENOPROTOOPT && optname != IP_HDRINCL &&
                        optname != IP_IPSEC_POLICY &&
                        optname != IP_XFRM_POLICY &&
        if (err == -ENOPROTOOPT && optname != IP_HDRINCL &&
                        optname != IP_IPSEC_POLICY &&
                        optname != IP_XFRM_POLICY &&

-                       !ip_mroute_opt(optname)) {
-               lock_sock(sk);
+                       !ip_mroute_opt(optname))

                err = nf_setsockopt(sk, PF_INET, optname, optval, optlen);
                err = nf_setsockopt(sk, PF_INET, optname, optval, optlen);

-               release_sock(sk);
-       }

 #endif
        return err;
 }
 #endif
        return err;
 }


@@ -1058,12 +1056,9 @@ int compat_ip_setsockopt(struct sock *sk, int level, int optname,
        if (err == -ENOPROTOOPT && optname != IP_HDRINCL &&
                        optname != IP_IPSEC_POLICY &&
                        optname != IP_XFRM_POLICY &&
        if (err == -ENOPROTOOPT && optname != IP_HDRINCL &&
                        optname != IP_IPSEC_POLICY &&
                        optname != IP_XFRM_POLICY &&

-                       !ip_mroute_opt(optname)) {
-               lock_sock(sk);
-               err = compat_nf_setsockopt(sk, PF_INET, optname,
-                                          optval, optlen);
-               release_sock(sk);
-       }
+                       !ip_mroute_opt(optname))
+               err = compat_nf_setsockopt(sk, PF_INET, optname, optval,
+                                          optlen);

 #endif
        return err;
 }
 #endif
        return err;
 }


@@ -1313,10 +1308,7 @@ int ip_getsockopt(struct sock *sk, int level,
                if (get_user(len, optlen))
                        return -EFAULT;
 
                if (get_user(len, optlen))
                        return -EFAULT;
 

-               lock_sock(sk);
-               err = nf_getsockopt(sk, PF_INET, optname, optval,
-                               &len);
-               release_sock(sk);
+               err = nf_getsockopt(sk, PF_INET, optname, optval, &len);

                if (err >= 0)
                        err = put_user(len, optlen);
                return err;
                if (err >= 0)
                        err = put_user(len, optlen);
                return err;


@@ -1348,9 +1340,7 @@ int compat_ip_getsockopt(struct sock *sk, int level, int optname,
                if (get_user(len, optlen))
                        return -EFAULT;
 
                if (get_user(len, optlen))
                        return -EFAULT;
 

-               lock_sock(sk);

                err = compat_nf_getsockopt(sk, PF_INET, optname, optval, &len);
                err = compat_nf_getsockopt(sk, PF_INET, optname, optval, &len);

-               release_sock(sk);

                if (err >= 0)
                        err = put_user(len, optlen);
                return err;
                if (err >= 0)
                        err = put_user(len, optlen);
                return err;