diff options
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/base.c | 3 | ||||
-rw-r--r-- | fs/proc/proc_sysctl.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 7c6b4ec83cb7..0ef52230f8c7 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -1170,7 +1170,8 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd) | |||
1170 | if (!proc_fd_access_allowed(inode)) | 1170 | if (!proc_fd_access_allowed(inode)) |
1171 | goto out; | 1171 | goto out; |
1172 | 1172 | ||
1173 | error = PROC_I(inode)->op.proc_get_link(inode, &nd->dentry, &nd->mnt); | 1173 | error = PROC_I(inode)->op.proc_get_link(inode, &nd->path.dentry, |
1174 | &nd->path.mnt); | ||
1174 | nd->last_type = LAST_BIND; | 1175 | nd->last_type = LAST_BIND; |
1175 | out: | 1176 | out: |
1176 | return ERR_PTR(error); | 1177 | return ERR_PTR(error); |
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index b9cb23c08f63..614c34b6d1c2 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c | |||
@@ -407,7 +407,7 @@ static int proc_sys_permission(struct inode *inode, int mask, struct nameidata * | |||
407 | if (!nd || !depth) | 407 | if (!nd || !depth) |
408 | goto out; | 408 | goto out; |
409 | 409 | ||
410 | dentry = nd->dentry; | 410 | dentry = nd->path.dentry; |
411 | table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head); | 411 | table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head); |
412 | 412 | ||
413 | /* If the entry does not exist deny permission */ | 413 | /* If the entry does not exist deny permission */ |