summaryrefslogtreecommitdiffstats
path: root/fs/befs
diff options
context:
space:
mode:
authorTimo Warns <Warns@pre-sense.de>2011-08-17 17:59:56 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-17 13:31:24 -0700
commit338d0f0a6fbc82407864606f5b64b75aeb3c70f2 (patch)
treeb9804e38d570cce426010cee5aae475a1dfd9604 /fs/befs
parentb4fd4ae6c6420c18e4bae2c294b7e06f5ff5210f (diff)
downloadlinux-stable-338d0f0a6fbc82407864606f5b64b75aeb3c70f2.tar.gz
linux-stable-338d0f0a6fbc82407864606f5b64b75aeb3c70f2.tar.bz2
linux-stable-338d0f0a6fbc82407864606f5b64b75aeb3c70f2.zip
befs: Validate length of long symbolic links.
Signed-off-by: Timo Warns <warns@pre-sense.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/befs')
-rw-r--r--fs/befs/linuxvfs.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index 54b8c28bebc8..720d885e8dca 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -474,17 +474,22 @@ befs_follow_link(struct dentry *dentry, struct nameidata *nd)
befs_data_stream *data = &befs_ino->i_data.ds;
befs_off_t len = data->size;
- befs_debug(sb, "Follow long symlink");
-
- link = kmalloc(len, GFP_NOFS);
- if (!link) {
- link = ERR_PTR(-ENOMEM);
- } else if (befs_read_lsymlink(sb, data, link, len) != len) {
- kfree(link);
- befs_error(sb, "Failed to read entire long symlink");
+ if (len == 0) {
+ befs_error(sb, "Long symlink with illegal length");
link = ERR_PTR(-EIO);
} else {
- link[len - 1] = '\0';
+ befs_debug(sb, "Follow long symlink");
+
+ link = kmalloc(len, GFP_NOFS);
+ if (!link) {
+ link = ERR_PTR(-ENOMEM);
+ } else if (befs_read_lsymlink(sb, data, link, len) != len) {
+ kfree(link);
+ befs_error(sb, "Failed to read entire long symlink");
+ link = ERR_PTR(-EIO);
+ } else {
+ link[len - 1] = '\0';
+ }
}
} else {
link = befs_ino->i_data.symlink;