summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@linux.vnet.ibm.com>2008-12-16 10:21:34 -0600
committerDave Kleikamp <shaggy@linux.vnet.ibm.com>2008-12-16 10:21:34 -0600
commitd69e83d99cf87e3328c47bb54684360e32aef17d (patch)
tree9e47526e5e585e8c9f4094e57c6fe694c64e9ef6 /fs
parenta3dd15444baa9c7522c8457ab564c41219dfb44c (diff)
downloadop-kernel-dev-d69e83d99cf87e3328c47bb54684360e32aef17d.zip
op-kernel-dev-d69e83d99cf87e3328c47bb54684360e32aef17d.tar.gz
jfs: ensure symlinks are NUL-terminated
This is an alternate fix for a bug reported and fixed by Duane Griffin. Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Reported-by: Duane Griffin <duaneg@dghda.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/jfs/inode.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 2103397..b00ee9f 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -59,8 +59,14 @@ struct inode *jfs_iget(struct super_block *sb, unsigned long ino)
if (inode->i_size >= IDATASIZE) {
inode->i_op = &page_symlink_inode_operations;
inode->i_mapping->a_ops = &jfs_aops;
- } else
+ } else {
inode->i_op = &jfs_symlink_inode_operations;
+ /*
+ * The inline data should be null-terminated, but
+ * don't let on-disk corruption crash the kernel
+ */
+ JFS_IP(inode)->i_inline[inode->i_size] = '\0';
+ }
} else {
inode->i_op = &jfs_file_inode_operations;
init_special_inode(inode, inode->i_mode, inode->i_rdev);
OpenPOWER on IntegriCloud