aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-29 20:38:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-29 20:38:07 -0700
commit0d4911081ce201f3e44bc8b32ac0f862d1260332 (patch)
treee6071b5ec945d05c1083d375c40688b29460e97c /fs
parent77f890223338c890fc33972673d2bd3a53061570 (diff)
parent1fc8a117865b54590acd773a55fbac9221b018f0 (diff)
downloadmrst-s0i3-test-0d4911081ce201f3e44bc8b32ac0f862d1260332.tar.gz
mrst-s0i3-test-0d4911081ce201f3e44bc8b32ac0f862d1260332.tar.xz
mrst-s0i3-test-0d4911081ce201f3e44bc8b32ac0f862d1260332.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Don't walk off the end of fast symlinks.
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/symlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
index 32499d213fc..9975457c981 100644
--- a/fs/ocfs2/symlink.c
+++ b/fs/ocfs2/symlink.c
@@ -128,7 +128,7 @@ static void *ocfs2_fast_follow_link(struct dentry *dentry,
}
/* Fast symlinks can't be large */
- len = strlen(target);
+ len = strnlen(target, ocfs2_fast_symlink_chars(inode->i_sb));
link = kzalloc(len + 1, GFP_NOFS);
if (!link) {
status = -ENOMEM;