diff options
author | Jeff Layton <jlayton@redhat.com> | 2012-10-10 15:25:23 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-12 00:32:01 -0400 |
commit | bfcec7087458812f575d9022b2d151641f34ee84 (patch) | |
tree | 6c0f7dd3b016992da8d113ceeaae404c6abc03a1 /fs/xattr.c | |
parent | 78e2e802a8519031e5858595070b39713e26340d (diff) |
audit: set the name_len in audit_inode for parent lookups
Currently, this gets set mostly by happenstance when we call into
audit_inode_child. While that might be a little more efficient, it seems
wrong. If the syscall ends up failing before audit_inode_child ever gets
called, then you'll have an audit_names record that shows the full path
but has the parent inode info attached.
Fix this by passing in a parent flag when we call audit_inode that gets
set to the value of LOOKUP_PARENT. We can then fix up the pathname for
the audit entry correctly from the get-go.
While we're at it, clean up the no-op macro for audit_inode in the
!CONFIG_AUDITSYSCALL case.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/xattr.c')
-rw-r--r-- | fs/xattr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xattr.c b/fs/xattr.c index 1780f062dbaf..e164dddb8e96 100644 --- a/fs/xattr.c +++ b/fs/xattr.c | |||
@@ -412,7 +412,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name, | |||
412 | if (!f.file) | 412 | if (!f.file) |
413 | return error; | 413 | return error; |
414 | dentry = f.file->f_path.dentry; | 414 | dentry = f.file->f_path.dentry; |
415 | audit_inode(NULL, dentry); | 415 | audit_inode(NULL, dentry, 0); |
416 | error = mnt_want_write_file(f.file); | 416 | error = mnt_want_write_file(f.file); |
417 | if (!error) { | 417 | if (!error) { |
418 | error = setxattr(dentry, name, value, size, flags); | 418 | error = setxattr(dentry, name, value, size, flags); |
@@ -507,7 +507,7 @@ SYSCALL_DEFINE4(fgetxattr, int, fd, const char __user *, name, | |||
507 | 507 | ||
508 | if (!f.file) | 508 | if (!f.file) |
509 | return error; | 509 | return error; |
510 | audit_inode(NULL, f.file->f_path.dentry); | 510 | audit_inode(NULL, f.file->f_path.dentry, 0); |
511 | error = getxattr(f.file->f_path.dentry, name, value, size); | 511 | error = getxattr(f.file->f_path.dentry, name, value, size); |
512 | fdput(f); | 512 | fdput(f); |
513 | return error; | 513 | return error; |
@@ -586,7 +586,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size) | |||
586 | 586 | ||
587 | if (!f.file) | 587 | if (!f.file) |
588 | return error; | 588 | return error; |
589 | audit_inode(NULL, f.file->f_path.dentry); | 589 | audit_inode(NULL, f.file->f_path.dentry, 0); |
590 | error = listxattr(f.file->f_path.dentry, list, size); | 590 | error = listxattr(f.file->f_path.dentry, list, size); |
591 | fdput(f); | 591 | fdput(f); |
592 | return error; | 592 | return error; |
@@ -655,7 +655,7 @@ SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name) | |||
655 | if (!f.file) | 655 | if (!f.file) |
656 | return error; | 656 | return error; |
657 | dentry = f.file->f_path.dentry; | 657 | dentry = f.file->f_path.dentry; |
658 | audit_inode(NULL, dentry); | 658 | audit_inode(NULL, dentry, 0); |
659 | error = mnt_want_write_file(f.file); | 659 | error = mnt_want_write_file(f.file); |
660 | if (!error) { | 660 | if (!error) { |
661 | error = removexattr(dentry, name); | 661 | error = removexattr(dentry, name); |