aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/mqueue.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2007-06-07 12:19:32 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2007-10-21 02:37:18 -0400
commit5a190ae69766da9a34bf31200c5cea4c0667cf94 (patch)
tree340c500fe42518abe6d1159a00619b1bd02f07fc /ipc/mqueue.c
parentcfa76f024f7c9e65169425804e5b32e71f66d0ee (diff)
[PATCH] pass dentry to audit_inode()/audit_inode_child()
makes caller simpler *and* allows to scan ancestors Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'ipc/mqueue.c')
-rw-r--r--ipc/mqueue.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index c0b26dc4617b..bfa274ba9ed4 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -676,7 +676,7 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
676 676
677 if (oflag & O_CREAT) { 677 if (oflag & O_CREAT) {
678 if (dentry->d_inode) { /* entry already exists */ 678 if (dentry->d_inode) { /* entry already exists */
679 audit_inode(name, dentry->d_inode); 679 audit_inode(name, dentry);
680 error = -EEXIST; 680 error = -EEXIST;
681 if (oflag & O_EXCL) 681 if (oflag & O_EXCL)
682 goto out; 682 goto out;
@@ -689,7 +689,7 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
689 error = -ENOENT; 689 error = -ENOENT;
690 if (!dentry->d_inode) 690 if (!dentry->d_inode)
691 goto out; 691 goto out;
692 audit_inode(name, dentry->d_inode); 692 audit_inode(name, dentry);
693 filp = do_open(dentry, oflag); 693 filp = do_open(dentry, oflag);
694 } 694 }
695 695
@@ -837,7 +837,7 @@ asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
837 if (unlikely(filp->f_op != &mqueue_file_operations)) 837 if (unlikely(filp->f_op != &mqueue_file_operations))
838 goto out_fput; 838 goto out_fput;
839 info = MQUEUE_I(inode); 839 info = MQUEUE_I(inode);
840 audit_inode(NULL, inode); 840 audit_inode(NULL, filp->f_path.dentry);
841 841
842 if (unlikely(!(filp->f_mode & FMODE_WRITE))) 842 if (unlikely(!(filp->f_mode & FMODE_WRITE)))
843 goto out_fput; 843 goto out_fput;
@@ -921,7 +921,7 @@ asmlinkage ssize_t sys_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
921 if (unlikely(filp->f_op != &mqueue_file_operations)) 921 if (unlikely(filp->f_op != &mqueue_file_operations))
922 goto out_fput; 922 goto out_fput;
923 info = MQUEUE_I(inode); 923 info = MQUEUE_I(inode);
924 audit_inode(NULL, inode); 924 audit_inode(NULL, filp->f_path.dentry);
925 925
926 if (unlikely(!(filp->f_mode & FMODE_READ))) 926 if (unlikely(!(filp->f_mode & FMODE_READ)))
927 goto out_fput; 927 goto out_fput;