1 files changed, 13 insertions, 1 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index 22183c2ef284..7e51d3a5e4f6 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -206,7 +206,19 @@ static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)
                 return -EINVAL;
         if (copy_from_user(&tv, optval, sizeof(tv)))
                 return -EFAULT;
-
+        if (tv.tv_usec < 0 || tv.tv_usec >= USEC_PER_SEC)
+                return -EDOM;
+
+        if (tv.tv_sec < 0) {
+                static int warned = 0;
+                *timeo_p = 0;
+                if (warned < 10 && net_ratelimit())
+                        warned++;
+                        printk(KERN_INFO "sock_set_timeout: `%s' (pid %d) "
+                               "tries to set negative timeout\n",
+                                current->comm, current->pid);
+                return 0;
+        }
         *timeo_p = MAX_SCHEDULE_TIMEOUT;
         if (tv.tv_sec == 0 && tv.tv_usec == 0)
                 return 0;