Auto merge with /home/aegl/GIT/linus

1 files changed, 7 insertions, 2 deletions

diff --git a/net/socket.c b/net/socket.c
index cec0cb38b9ce..38729af09461 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -81,6 +81,7 @@
 #include <linux/syscalls.h>
 #include <linux/compat.h>
 #include <linux/kmod.h>
+#include <linux/audit.h>
 
 #ifdef CONFIG_NET_RADIO
 #include <linux/wireless.h>             /* Note : will define WIRELESS_EXT */
@@ -226,7 +227,7 @@ int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr)
                 return 0;
         if(copy_from_user(kaddr,uaddr,ulen))
                 return -EFAULT;
-        return 0;
+        return audit_sockaddr(ulen, kaddr);
 }
 
 /**
@@ -1906,7 +1907,11 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args)
         /* copy_from_user should be SMP safe. */
         if (copy_from_user(a, args, nargs[call]))
                 return -EFAULT;
-                
+
+        err = audit_socketcall(nargs[call]/sizeof(unsigned long), a);
+        if (err)
+                return err;
+
         a0=a[0];
         a1=a[1];