Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit
Pull audit updates from Paul Moore:
"The audit changes for v4.11 are relatively small compared to what we
did for v4.10, both in terms of size and impact.
- two patches from Steve tweak the formatting for some of the audit
records to make them more consistent with other audit records.
- three patches from Richard record the name of a module on module
load, fix the logging of sockaddr information when using
socketcall() on 32-bit systems, and add the ability to reset
audit's lost record counter.
- my lone patch just fixes an annoying style nit that I was reminded
about by one of Richard's patches.
All these patches pass our test suite"
* 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit:
audit: remove unnecessary curly braces from switch/case statements
audit: log module name on init_module
audit: log 32-bit socketcalls
audit: add feature audit_lost reset
audit: Make AUDIT_ANOM_ABEND event normalized
audit: Make AUDIT_KERNEL event conform to the specification
This commit is contained in:
17
net/compat.c
17
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];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user