diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-02-21 22:16:11 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-02-22 11:43:12 -0500 |
commit | 7e0e953bb0cf649f93277ac8fb67ecbb7f7b04a9 (patch) | |
tree | 1ba29a05213aefe77827f268624948ad417c984a /fs/proc/generic.c | |
parent | 0db59e59299f0b67450c5db21f7f316c8fb04e84 (diff) |
procfs: fix race between symlink removals and traversals
use_pde()/unuse_pde() in ->follow_link()/->put_link() resp.
Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc/generic.c')
-rw-r--r-- | fs/proc/generic.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 3309f59d421b..be65b2082135 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/mount.h> | 19 | #include <linux/mount.h> |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/idr.h> | 21 | #include <linux/idr.h> |
22 | #include <linux/namei.h> | ||
23 | #include <linux/bitops.h> | 22 | #include <linux/bitops.h> |
24 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
25 | #include <linux/completion.h> | 24 | #include <linux/completion.h> |
@@ -223,17 +222,6 @@ void proc_free_inum(unsigned int inum) | |||
223 | spin_unlock_irqrestore(&proc_inum_lock, flags); | 222 | spin_unlock_irqrestore(&proc_inum_lock, flags); |
224 | } | 223 | } |
225 | 224 | ||
226 | static void *proc_follow_link(struct dentry *dentry, struct nameidata *nd) | ||
227 | { | ||
228 | nd_set_link(nd, __PDE_DATA(dentry->d_inode)); | ||
229 | return NULL; | ||
230 | } | ||
231 | |||
232 | static const struct inode_operations proc_link_inode_operations = { | ||
233 | .readlink = generic_readlink, | ||
234 | .follow_link = proc_follow_link, | ||
235 | }; | ||
236 | |||
237 | /* | 225 | /* |
238 | * Don't create negative dentries here, return -ENOENT by hand | 226 | * Don't create negative dentries here, return -ENOENT by hand |
239 | * instead. | 227 | * instead. |