diff options
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index ace151fa4878..491f2d9f89ac 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -890,7 +890,7 @@ static struct file_operations proc_seccomp_operations = { | |||
| 890 | }; | 890 | }; |
| 891 | #endif /* CONFIG_SECCOMP */ | 891 | #endif /* CONFIG_SECCOMP */ |
| 892 | 892 | ||
| 893 | static int proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd) | 893 | static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd) |
| 894 | { | 894 | { |
| 895 | struct inode *inode = dentry->d_inode; | 895 | struct inode *inode = dentry->d_inode; |
| 896 | int error = -EACCES; | 896 | int error = -EACCES; |
| @@ -907,7 +907,7 @@ static int proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd) | |||
| 907 | error = PROC_I(inode)->op.proc_get_link(inode, &nd->dentry, &nd->mnt); | 907 | error = PROC_I(inode)->op.proc_get_link(inode, &nd->dentry, &nd->mnt); |
| 908 | nd->last_type = LAST_BIND; | 908 | nd->last_type = LAST_BIND; |
| 909 | out: | 909 | out: |
| 910 | return error; | 910 | return ERR_PTR(error); |
| 911 | } | 911 | } |
| 912 | 912 | ||
| 913 | static int do_proc_readlink(struct dentry *dentry, struct vfsmount *mnt, | 913 | static int do_proc_readlink(struct dentry *dentry, struct vfsmount *mnt, |
| @@ -1692,11 +1692,11 @@ static int proc_self_readlink(struct dentry *dentry, char __user *buffer, | |||
| 1692 | return vfs_readlink(dentry,buffer,buflen,tmp); | 1692 | return vfs_readlink(dentry,buffer,buflen,tmp); |
| 1693 | } | 1693 | } |
| 1694 | 1694 | ||
| 1695 | static int proc_self_follow_link(struct dentry *dentry, struct nameidata *nd) | 1695 | static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd) |
| 1696 | { | 1696 | { |
| 1697 | char tmp[30]; | 1697 | char tmp[30]; |
| 1698 | sprintf(tmp, "%d", current->tgid); | 1698 | sprintf(tmp, "%d", current->tgid); |
| 1699 | return vfs_follow_link(nd,tmp); | 1699 | return ERR_PTR(vfs_follow_link(nd,tmp)); |
| 1700 | } | 1700 | } |
| 1701 | 1701 | ||
| 1702 | static struct inode_operations proc_self_inode_operations = { | 1702 | static struct inode_operations proc_self_inode_operations = { |
