diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-09-30 02:33:05 +0200 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-09-30 02:33:05 +0200 |
| commit | 1fc8a117865b54590acd773a55fbac9221b018f0 (patch) | |
| tree | b086c52bcc77ab3816653719f0c6ad4e33c5c74c | |
| parent | Linux 2.6.36-rc6 (diff) | |
| download | linux-1fc8a117865b54590acd773a55fbac9221b018f0.tar.xz linux-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
| -rw-r--r-- | fs/ocfs2/symlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c index 32499d213fc4..9975457c981f 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; |