summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChen Gang <gang.chen@asianux.com>2013-04-07 16:55:23 +0800
committerEric Paris <eparis@redhat.com>2013-04-10 13:31:12 -0400
commit2950fa9d3291b90e9b7663b6a409ea37a97a5e35 (patch)
tree59d613c0734447257a48974d81035538e8397b48 /net
parent65ada7bc02e2dcea6dea1f11876e712d5ea7e9ba (diff)
downloadop-kernel-dev-2950fa9d3291b90e9b7663b6a409ea37a97a5e35.zip
op-kernel-dev-2950fa9d3291b90e9b7663b6a409ea37a97a5e35.tar.gz
kernel: audit: beautify code, for extern function, better to check its parameters by itself
__audit_socketcall is an extern function. better to check its parameters by itself. also can return error code, when fail (find invalid parameters). also use macro instead of real hard code number also give related comments for it. Signed-off-by: Chen Gang <gang.chen@asianux.com> [eparis: fix the return value when !CONFIG_AUDIT] Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/socket.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c
index 2ca51c7..1bbc37b 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2436,7 +2436,7 @@ static const unsigned char nargs[21] = {
SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
{
- unsigned long a[6];
+ unsigned long a[AUDITSC_ARGS];
unsigned long a0, a1;
int err;
unsigned int len;
@@ -2452,7 +2452,9 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
if (copy_from_user(a, args, len))
return -EFAULT;
- audit_socketcall(nargs[call] / sizeof(unsigned long), a);
+ err = audit_socketcall(nargs[call] / sizeof(unsigned long), a);
+ if (err)
+ return err;
a0 = a[0];
a1 = a[1];
OpenPOWER on IntegriCloud