summaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
authorDuane Griffin <duaneg@dghda.com>2008-12-19 20:47:14 +0000
committerAl Viro <viro@zeniv.linux.org.uk>2008-12-31 18:07:39 -0500
commitb5ed3112b5f74c8ec1c7aa03a76c596635e85197 (patch)
tree943736d8c2502a8bebf71d86296bd98377235690 /fs/ext3
parent8d6d0c4da2dbbe0a69fea3692146af39f139f8b4 (diff)
downloadop-kernel-dev-b5ed3112b5f74c8ec1c7aa03a76c596635e85197.zip
op-kernel-dev-b5ed3112b5f74c8ec1c7aa03a76c596635e85197.tar.gz
ext3: ensure fast symlinks are NUL-terminated
Ensure fast symlink targets are NUL-terminated, even if corrupted on-disk. Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Stephen Tweedie <sct@redhat.com> Cc: linux-ext4@vger.kernel.org Signed-off-by: Duane Griffin <duaneg@dghda.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/inode.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index f8424ad..c4bdccf 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -37,6 +37,7 @@
#include <linux/uio.h>
#include <linux/bio.h>
#include <linux/fiemap.h>
+#include <linux/namei.h>
#include "xattr.h"
#include "acl.h"
@@ -2817,9 +2818,11 @@ struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
inode->i_op = &ext3_dir_inode_operations;
inode->i_fop = &ext3_dir_operations;
} else if (S_ISLNK(inode->i_mode)) {
- if (ext3_inode_is_fast_symlink(inode))
+ if (ext3_inode_is_fast_symlink(inode)) {
inode->i_op = &ext3_fast_symlink_inode_operations;
- else {
+ nd_terminate_link(ei->i_data, inode->i_size,
+ sizeof(ei->i_data) - 1);
+ } else {
inode->i_op = &ext3_symlink_inode_operations;
ext3_set_aops(inode);
}
OpenPOWER on IntegriCloud