Revert "net-packet: fix race in packet_set_ring on PACKET_RESERVE"

[mirror_ubuntu-zesty-kernel.git] / net / packet / af_packet.c

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index ebde2ef2f1229826459a87cea833a8da541321c8..0f074c96f43f9eff16a22c2757e7d4ddbed6c661 100644 (file)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3640,19 +3640,14 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
 
                if (optlen != sizeof(val))
                        return -EINVAL;
+               if (po->rx_ring.pg_vec || po->tx_ring.pg_vec)
+                       return -EBUSY;
                if (copy_from_user(&val, optval, sizeof(val)))
                        return -EFAULT;
                if (val > INT_MAX)
                        return -EINVAL;
-               lock_sock(sk);
-               if (po->rx_ring.pg_vec || po->tx_ring.pg_vec)
-                       ret = -EBUSY;
-               else {
-                       po->tp_reserve = val;
-                       ret = 0;
-               }
-               release_sock(sk);
-               return ret;
+               po->tp_reserve = val;
+               return 0;
        }
        case PACKET_LOSS:
        {