summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDuane Griffin <duaneg@dghda.com>2008-12-19 20:47:18 +0000
committerAl Viro <viro@zeniv.linux.org.uk>2008-12-31 18:07:40 -0500
commit7df5fa06de89a4ac311957e0cb9c1d87552b4325 (patch)
tree2b724c54d644eb4649502577743e549966e4816f /fs
parenta63d0ff31a136bdf52350c4e6c2929eaf47ea2b2 (diff)
downloadlinux-3.10-7df5fa06de89a4ac311957e0cb9c1d87552b4325.tar.gz
linux-3.10-7df5fa06de89a4ac311957e0cb9c1d87552b4325.tar.bz2
linux-3.10-7df5fa06de89a4ac311957e0cb9c1d87552b4325.zip
befs: ensure fast symlinks are NUL-terminated
Ensure fast symlink targets are NUL-terminated, even if corrupted on-disk. Cc: Sergey S. Kostyliov <rathamahata@php4.ru> Signed-off-by: Duane Griffin <duaneg@dghda.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/befs/linuxvfs.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index b6dfee37c7b..d06cb023ad0 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -378,7 +378,8 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino)
inode->i_size = 0;
inode->i_blocks = befs_sb->block_size / VFS_BLOCK_SIZE;
strncpy(befs_ino->i_data.symlink, raw_inode->data.symlink,
- BEFS_SYMLINK_LEN);
+ BEFS_SYMLINK_LEN - 1);
+ befs_ino->i_data.symlink[BEFS_SYMLINK_LEN - 1] = '\0';
} else {
int num_blks;
@@ -477,6 +478,8 @@ befs_follow_link(struct dentry *dentry, struct nameidata *nd)
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;