Commit 37882db0 authored by NeilBrown's avatar NeilBrown Committed by Al Viro

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: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b4272646
...@@ -871,7 +871,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p) ...@@ -871,7 +871,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
touch_atime(link); touch_atime(link);
nd_set_link(nd, NULL); nd_set_link(nd, NULL);
error = security_inode_follow_link(link->dentry, nd); error = security_inode_follow_link(dentry);
if (error) if (error)
goto out_put_nd_path; goto out_put_nd_path;
......
...@@ -43,7 +43,6 @@ struct file; ...@@ -43,7 +43,6 @@ struct file;
struct vfsmount; struct vfsmount;
struct path; struct path;
struct qstr; struct qstr;
struct nameidata;
struct iattr; struct iattr;
struct fown_struct; struct fown_struct;
struct file_operations; struct file_operations;
...@@ -477,7 +476,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) ...@@ -477,7 +476,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
* @inode_follow_link: * @inode_follow_link:
* Check permission to follow a symbolic link when looking up a pathname. * Check permission to follow a symbolic link when looking up a pathname.
* @dentry contains the dentry structure for the link. * @dentry contains the dentry structure for the link.
* @nd contains the nameidata structure for the parent directory.
* Return 0 if permission is granted. * Return 0 if permission is granted.
* @inode_permission: * @inode_permission:
* Check permission before accessing an inode. This hook is called by the * Check permission before accessing an inode. This hook is called by the
...@@ -1553,7 +1551,7 @@ struct security_operations { ...@@ -1553,7 +1551,7 @@ struct security_operations {
int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry, int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry); struct inode *new_dir, struct dentry *new_dentry);
int (*inode_readlink) (struct dentry *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_permission) (struct inode *inode, int mask);
int (*inode_setattr) (struct dentry *dentry, struct iattr *attr); int (*inode_setattr) (struct dentry *dentry, struct iattr *attr);
int (*inode_getattr) (const struct path *path); int (*inode_getattr) (const struct path *path);
...@@ -1839,7 +1837,7 @@ int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -1839,7 +1837,7 @@ int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry, struct inode *new_dir, struct dentry *new_dentry,
unsigned int flags); unsigned int flags);
int security_inode_readlink(struct dentry *dentry); 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_permission(struct inode *inode, int mask);
int security_inode_setattr(struct dentry *dentry, struct iattr *attr); int security_inode_setattr(struct dentry *dentry, struct iattr *attr);
int security_inode_getattr(const struct path *path); int security_inode_getattr(const struct path *path);
...@@ -2241,8 +2239,7 @@ static inline int security_inode_readlink(struct dentry *dentry) ...@@ -2241,8 +2239,7 @@ static inline int security_inode_readlink(struct dentry *dentry)
return 0; return 0;
} }
static inline int security_inode_follow_link(struct dentry *dentry, static inline int security_inode_follow_link(struct dentry *dentry)
struct nameidata *nd)
{ {
return 0; return 0;
} }
......
...@@ -209,8 +209,7 @@ static int cap_inode_readlink(struct dentry *dentry) ...@@ -209,8 +209,7 @@ static int cap_inode_readlink(struct dentry *dentry)
return 0; return 0;
} }
static int cap_inode_follow_link(struct dentry *dentry, static int cap_inode_follow_link(struct dentry *dentry)
struct nameidata *nameidata)
{ {
return 0; return 0;
} }
......
...@@ -581,11 +581,11 @@ int security_inode_readlink(struct dentry *dentry) ...@@ -581,11 +581,11 @@ int security_inode_readlink(struct dentry *dentry)
return security_ops->inode_readlink(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)))) if (unlikely(IS_PRIVATE(d_backing_inode(dentry))))
return 0; 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) int security_inode_permission(struct inode *inode, int mask)
......
...@@ -2861,7 +2861,7 @@ static int selinux_inode_readlink(struct dentry *dentry) ...@@ -2861,7 +2861,7 @@ static int selinux_inode_readlink(struct dentry *dentry)
return dentry_has_perm(cred, dentry, FILE__READ); 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(); const struct cred *cred = current_cred();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment