diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 22:54:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 22:54:12 +0200 |
| commit | 19fa95e9e999ee2b0d7adfbd1a687b136afcd6f1 (patch) | |
| tree | 99bd4cf3f47965b52f43a5fde01b2e53e01f77ba /net | |
| parent | [PATCH] DocBook: MAINTAINER entry (diff) | |
| parent | Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff) | |
| download | linux-19fa95e9e999ee2b0d7adfbd1a687b136afcd6f1.tar.xz linux-19fa95e9e999ee2b0d7adfbd1a687b136afcd6f1.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket.c | 9 |
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]; |