Merge branch 'master' into upstream

1 files changed, 2 insertions, 0 deletions

diff --git a/net/socket.c b/net/socket.c
index 0ce12dfc7a71..02948b622bd2 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -267,6 +267,8 @@ int move_addr_to_user(void *kaddr, int klen, void __user *uaddr, int __user *ule
                 return -EINVAL;
         if(len)
         {
+                if (audit_sockaddr(klen, kaddr))
+                        return -ENOMEM;
                 if(copy_to_user(uaddr,kaddr,len))
                         return -EFAULT;
         }