aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2010-09-29 17:33:05 -0700
committerJoel Becker <joel.becker@oracle.com>2010-09-29 17:33:05 -0700
commit1fc8a117865b54590acd773a55fbac9221b018f0 (patch)
treeb086c52bcc77ab3816653719f0c6ad4e33c5c74c /fs
parent899611ee7d373e5eeda08e9a8632684e1ebbbf00 (diff)
downloadmrst-s0i3-test-1fc8a117865b54590acd773a55fbac9221b018f0.tar.gz
mrst-s0i3-test-1fc8a117865b54590acd773a55fbac9221b018f0.tar.xz
mrst-s0i3-test-1fc8a117865b54590acd773a55fbac9221b018f0.zip
ocfs2: Don't walk off the end of fast symlinks.
ocfs2 fast symlinks are NUL terminated strings stored inline in the inode data area. However, disk corruption or a local attacker could, in theory, remove that NUL. Because we're using strlen() (my fault, introduced in a731d1 when removing vfs_follow_link()), we could walk off the end of that string. Signed-off-by: Joel Becker <joel.becker@oracle.com> Cc: stable@kernel.org
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;