Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit

[mirror_ubuntu-bionic-kernel.git] / net / compat.c

diff --git a/net/compat.c b/net/compat.c
index 1cd2ec046164a659d7e4ad1b1acc24eceb780a6e..d69f539ca0bc5021fd8b20f6ee6297ccd07cad28 100644 (file)
--- a/net/compat.c
+++ b/net/compat.c
@@ -22,13 +22,14 @@
 #include <linux/filter.h>
 #include <linux/compat.h>
 #include <linux/security.h>
+#include <linux/audit.h>
 #include <linux/export.h>
 
 #include <net/scm.h>
 #include <net/sock.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <net/compat.h>
 
 int get_compat_msghdr(struct msghdr *kmsg,
@@ -781,14 +782,24 @@ COMPAT_SYSCALL_DEFINE5(recvmmsg, int, fd, struct compat_mmsghdr __user *, mmsg,
 
 COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
 {
-       int ret;
-       u32 a[6];
+       u32 a[AUDITSC_ARGS];
+       unsigned int len;
        u32 a0, a1;
+       int ret;
 
        if (call < SYS_SOCKET || call > SYS_SENDMMSG)
                return -EINVAL;
-       if (copy_from_user(a, args, nas[call]))
+       len = nas[call];
+       if (len > sizeof(a))
+               return -EINVAL;
+
+       if (copy_from_user(a, args, len))
                return -EFAULT;
+
+       ret = audit_socketcall_compat(len / sizeof(a[0]), a);
+       if (ret)
+               return ret;
+
        a0 = a[0];
        a1 = a[1];