diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 18f616f487eaad0f7b31fb074e194c0479f30d77..555f0d296d6f73ef834cf9ab86f9d5790192aba1 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3800,28 +3800,30 @@ packet_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval,
        case PACKET_TX_RING:
        {
                union tpacket_req_u req_u;
-               int len;
 
+               ret = -EINVAL;
                lock_sock(sk);
                switch (po->tp_version) {
                case TPACKET_V1:
                case TPACKET_V2:
-                       len = sizeof(req_u.req);
+                       if (optlen < sizeof(req_u.req))
+                               break;
+                       err = copy_from_sockptr(&req_u.req, optval,
+                                               sizeof(req_u.req)) ?
+                               -EINVAL : 0;
                        break;
                case TPACKET_V3:
                default:
-                       len = sizeof(req_u.req3);
+                       if (optlen < sizeof(req_u.req3))
+                               break;
+                       err = copy_from_sockptr(&req_u.req3, optval,
+                                               sizeof(req_u.req3)) ?
+                               -EINVAL : 0;
                        break;
                }
-               if (optlen < len) {
-                       ret = -EINVAL;
-               } else {
-                       if (copy_from_sockptr(&req_u.req, optval, len))
-                               ret = -EFAULT;
-                       else
-                               ret = packet_set_ring(sk, &req_u, 0,
-                                                   optname == PACKET_TX_RING);
-               }
+               if (!ret)
+                       ret = packet_set_ring(sk, &req_u, 0,
+                                             optname == PACKET_TX_RING);
                release_sock(sk);
                return ret;
        }