SECURITY: remove nameidata arg from inode_follow_link.

No ->inode_follow_link() methods use the nameidata arg, and
it is about to become private to namei.c.
So remove from all inode_follow_link() functions.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/namei.c b/fs/namei.c
index fe30d3be43a8b381d3b9ac3016b28531996f91b7..7f20b40426dcb8773957d30e9af407a2f49e987f 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -871,7 +871,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
        touch_atime(link);
        nd_set_link(nd, NULL);
 
-       error = security_inode_follow_link(link->dentry, nd);
+       error = security_inode_follow_link(dentry);
        if (error)
                goto out_put_nd_path;
 

diff --git a/include/linux/security.h b/include/linux/security.h
index 18264ea9e314153488f9726b530993658c4cea25..62a66202ecf1bda3d155e3950abbf904e0e2604b 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -43,7 +43,6 @@ struct file;
 struct vfsmount;
 struct path;
 struct qstr;
-struct nameidata;
 struct iattr;
 struct fown_struct;
 struct file_operations;
@@ -477,7 +476,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  * @inode_follow_link:
  *     Check permission to follow a symbolic link when looking up a pathname.
  *     @dentry contains the dentry structure for the link.
- *     @nd contains the nameidata structure for the parent directory.
  *     Return 0 if permission is granted.
  * @inode_permission:
  *     Check permission before accessing an inode.  This hook is called by the
@@ -1553,7 +1551,7 @@ struct security_operations {
        int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
                             struct inode *new_dir, struct dentry *new_dentry);
        int (*inode_readlink) (struct dentry *dentry);
-       int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd);
+       int (*inode_follow_link) (struct dentry *dentry);
        int (*inode_permission) (struct inode *inode, int mask);
        int (*inode_setattr)    (struct dentry *dentry, struct iattr *attr);
        int (*inode_getattr) (const struct path *path);
@@ -1839,7 +1837,7 @@ int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
                          struct inode *new_dir, struct dentry *new_dentry,
                          unsigned int flags);
 int security_inode_readlink(struct dentry *dentry);
-int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd);
+int security_inode_follow_link(struct dentry *dentry);
 int security_inode_permission(struct inode *inode, int mask);
 int security_inode_setattr(struct dentry *dentry, struct iattr *attr);
 int security_inode_getattr(const struct path *path);
@@ -2241,8 +2239,7 @@ static inline int security_inode_readlink(struct dentry *dentry)
        return 0;
 }
 
-static inline int security_inode_follow_link(struct dentry *dentry,
-                                             struct nameidata *nd)
+static inline int security_inode_follow_link(struct dentry *dentry)
 {
        return 0;
 }

diff --git a/security/capability.c b/security/capability.c
index 0d03fcc489a49ee3221b1369ca2c1ff931c691cd..fae99db180caad3457e26c6c50a5238e5f36e0f9 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -209,8 +209,7 @@ static int cap_inode_readlink(struct dentry *dentry)
        return 0;
 }
 
-static int cap_inode_follow_link(struct dentry *dentry,
-                                struct nameidata *nameidata)
+static int cap_inode_follow_link(struct dentry *dentry)
 {
        return 0;
 }

diff --git a/security/security.c b/security/security.c
index 8e9b1f4b9b45dfac98287fe969b869a3a29fb2bc..d7c30b03e144ce02fd221b402eba7dd256573ec0 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -581,11 +581,11 @@ int security_inode_readlink(struct dentry *dentry)
        return security_ops->inode_readlink(dentry);
 }
 
-int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
+int security_inode_follow_link(struct dentry *dentry)
 {
        if (unlikely(IS_PRIVATE(d_backing_inode(dentry))))
                return 0;
-       return security_ops->inode_follow_link(dentry, nd);
+       return security_ops->inode_follow_link(dentry);
 }
 
 int security_inode_permission(struct inode *inode, int mask)

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 7dade28affba5a0ebc0944be49dbd59dbf5c8761..8016229472824bf68b7064e286470154211e4a67 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2861,7 +2861,7 @@ static int selinux_inode_readlink(struct dentry *dentry)
        return dentry_has_perm(cred, dentry, FILE__READ);
 }
 
-static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *nameidata)
+static int selinux_inode_follow_link(struct dentry *dentry)
 {
        const struct cred *cred = current_cred();