diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-09-29 17:33:05 -0700 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-06 18:08:11 -0500 |
| commit | 2428efbc77b557fe7e6e2d06dd4fb94aef18f6b1 (patch) | |
| tree | f1cc86d61be66959b3fef61768a490a94a7848d8 /fs | |
| parent | 388a1771e497f0b78c8993e0259316673d5bc840 (diff) | |
| download | lwn-2428efbc77b557fe7e6e2d06dd4fb94aef18f6b1.tar.gz lwn-2428efbc77b557fe7e6e2d06dd4fb94aef18f6b1.zip | |
ocfs2: Don't walk off the end of fast symlinks.
commit 1fc8a117865b54590acd773a55fbac9221b018f0 upstream.
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>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'fs')
| -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; |