summaryrefslogtreecommitdiffstats
path: root/net/compat.c
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2017-01-17 11:07:15 -0500
committerPaul Moore <paul@paul-moore.com>2017-01-18 15:05:25 -0500
commit62bc306e2083436675e33b5bdeb6a77907d35971 (patch)
treec209cd6b56b331e8dcc1f4bff2eb75ce822226da /net/compat.c
parent92c82e8a322b32a6cabe7d8800dc10401157a623 (diff)
downloadlinux-62bc306e2083436675e33b5bdeb6a77907d35971.tar.gz
linux-62bc306e2083436675e33b5bdeb6a77907d35971.tar.bz2
linux-62bc306e2083436675e33b5bdeb6a77907d35971.zip
audit: log 32-bit socketcalls
32-bit socketcalls were not being logged by audit on x86_64 systems. Log them. This is basically a duplicate of the call from net/socket.c:sys_socketcall(), but it addresses the impedance mismatch between 32-bit userspace process and 64-bit kernel audit. See: https://github.com/linux-audit/audit-kernel/issues/14 Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'net/compat.c')
-rw-r--r--net/compat.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/net/compat.c b/net/compat.c
index 1cd2ec046164..a96fd2f3507b 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -22,6 +22,7 @@
#include <linux/filter.h>
#include <linux/compat.h>
#include <linux/security.h>
+#include <linux/audit.h>
#include <linux/export.h>
#include <net/scm.h>
@@ -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];