diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 12:57:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 12:57:16 -0400 |
commit | 853da0022023c046e0a5ccc51d427745f0c94de7 (patch) | |
tree | bc36f80f00aa11c3c239a80ecf04ba8238219ce8 /fs/xattr.c | |
parent | 5884c40668a928bba017eaf54e2eb3c01c8a98e6 (diff) | |
parent | 0a4ff8c2598b72f2fa9d50aae9e1809e684dbf41 (diff) |
Merge branch 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
[PATCH] Abnormal End of Processes
[PATCH] match audit name data
[PATCH] complete message queue auditing
[PATCH] audit inode for all xattr syscalls
[PATCH] initialize name osid
[PATCH] audit signal recipients
[PATCH] add SIGNAL syscall class (v3)
[PATCH] auditing ptrace
Diffstat (limited to 'fs/xattr.c')
-rw-r--r-- | fs/xattr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xattr.c b/fs/xattr.c index 9f4568b55b0f..4523aca79659 100644 --- a/fs/xattr.c +++ b/fs/xattr.c | |||
@@ -350,6 +350,7 @@ sys_fgetxattr(int fd, char __user *name, void __user *value, size_t size) | |||
350 | f = fget(fd); | 350 | f = fget(fd); |
351 | if (!f) | 351 | if (!f) |
352 | return error; | 352 | return error; |
353 | audit_inode(NULL, f->f_path.dentry->d_inode); | ||
353 | error = getxattr(f->f_path.dentry, name, value, size); | 354 | error = getxattr(f->f_path.dentry, name, value, size); |
354 | fput(f); | 355 | fput(f); |
355 | return error; | 356 | return error; |
@@ -422,6 +423,7 @@ sys_flistxattr(int fd, char __user *list, size_t size) | |||
422 | f = fget(fd); | 423 | f = fget(fd); |
423 | if (!f) | 424 | if (!f) |
424 | return error; | 425 | return error; |
426 | audit_inode(NULL, f->f_path.dentry->d_inode); | ||
425 | error = listxattr(f->f_path.dentry, list, size); | 427 | error = listxattr(f->f_path.dentry, list, size); |
426 | fput(f); | 428 | fput(f); |
427 | return error; | 429 | return error; |