net: support 64bit values for setsockopt(SO_MAX_PACING_RATE)

64bit kernels now support 64bit pacing rates.

This commit changes setsockopt() to accept 64bit
values provided by applications.

Old applications providing 32bit value are still supported,
but limited to the old 34Gbit limitation.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/sock.c b/net/core/sock.c
index f5d82f3fa474deb204257972d4f1492de4c161d4..23aa02ffd6b811a294e232af0bd25f84d3c848cc 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1108,15 +1108,23 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 #endif
 
        case SO_MAX_PACING_RATE:
-               if (val != ~0U)
+               {
+               unsigned long ulval = (val == ~0U) ? ~0UL : val;
+
+               if (sizeof(ulval) != sizeof(val) &&
+                   optlen >= sizeof(ulval) &&
+                   get_user(ulval, (unsigned long __user *)optval)) {
+                       ret = -EFAULT;
+                       break;
+               }
+               if (ulval != ~0UL)
                        cmpxchg(&sk->sk_pacing_status,
                                SK_PACING_NONE,
                                SK_PACING_NEEDED);
-               sk->sk_max_pacing_rate = (val == ~0U) ? ~0UL : val;
-               sk->sk_pacing_rate = min(sk->sk_pacing_rate,
-                                        sk->sk_max_pacing_rate);
+               sk->sk_max_pacing_rate = ulval;
+               sk->sk_pacing_rate = min(sk->sk_pacing_rate, ulval);
                break;
-
+               }
        case SO_INCOMING_CPU:
                sk->sk_incoming_cpu = val;
                break;