diff options
author | Erez Zadok <ezk@fsl.cs.sunysb.edu> | 2011-05-21 01:19:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 03:12:16 -0400 |
commit | 1a4022f88d40e1255920b017556092ab926d7f66 (patch) | |
tree | f4e54841dae0ecf1324a3002bc540f8b6ba441d5 | |
parent | 052497553e5dedc04c43800820c1d5788201cc71 (diff) |
VFS: move BUG_ON test for symlink nd->depth after current->link_count test
This solves a serious VFS-level bug in nested_symlink (which was
rewritten from do_follow_link), and follows the order of depth tests
that existed before.
The bug triggers a BUG_ON in fs/namei.c:1381, when running racer with
symlink and rename ops.
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Acked-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index e3c4f112ebf7..6ff858c049c0 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -1378,12 +1378,12 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd) | |||
1378 | { | 1378 | { |
1379 | int res; | 1379 | int res; |
1380 | 1380 | ||
1381 | BUG_ON(nd->depth >= MAX_NESTED_LINKS); | ||
1382 | if (unlikely(current->link_count >= MAX_NESTED_LINKS)) { | 1381 | if (unlikely(current->link_count >= MAX_NESTED_LINKS)) { |
1383 | path_put_conditional(path, nd); | 1382 | path_put_conditional(path, nd); |
1384 | path_put(&nd->path); | 1383 | path_put(&nd->path); |
1385 | return -ELOOP; | 1384 | return -ELOOP; |
1386 | } | 1385 | } |
1386 | BUG_ON(nd->depth >= MAX_NESTED_LINKS); | ||
1387 | 1387 | ||
1388 | nd->depth++; | 1388 | nd->depth++; |
1389 | current->link_count++; | 1389 | current->link_count++; |