Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 1179506..d6c91d1 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -925,7 +925,7 @@ static inline int may_follow_link(struct nameidata *nd)
                return -ECHILD;
 
        audit_inode(nd->name, nd->stack[0].link.dentry, 0);
-       audit_log_link_denied("follow_link");
+       audit_log_path_denied(AUDIT_ANOM_LINK, "follow_link");
        return -EACCES;
 }
 
@@ -993,7 +993,7 @@ static int may_linkat(struct path *link)
        if (safe_hardlink_source(inode) || inode_owner_or_capable(inode))
                return 0;
 
-       audit_log_link_denied("linkat");
+       audit_log_path_denied(AUDIT_ANOM_LINK, "linkat");
        return -EPERM;
 }
 
@@ -1031,6 +1031,10 @@ static int may_create_in_sticky(struct dentry * const dir,
            (dir->d_inode->i_mode & 0020 &&
             ((sysctl_protected_fifos >= 2 && S_ISFIFO(inode->i_mode)) ||
              (sysctl_protected_regular >= 2 && S_ISREG(inode->i_mode))))) {
+               const char *operation = S_ISFIFO(inode->i_mode) ?
+                                       "sticky_create_fifo" :
+                                       "sticky_create_regular";
+               audit_log_path_denied(AUDIT_ANOM_CREAT, operation);
                return -EACCES;
        }
        return 0;