diff options
author | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2008-12-16 11:21:34 -0500 |
---|---|---|
committer | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2008-12-16 11:21:34 -0500 |
commit | d69e83d99cf87e3328c47bb54684360e32aef17d (patch) | |
tree | 9e47526e5e585e8c9f4094e57c6fe694c64e9ef6 /fs/jfs | |
parent | a3dd15444baa9c7522c8457ab564c41219dfb44c (diff) |
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/jfs')
-rw-r--r-- | fs/jfs/inode.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index 210339784b56..b00ee9f05a06 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) | |||
59 | if (inode->i_size >= IDATASIZE) { | 59 | if (inode->i_size >= IDATASIZE) { |
60 | inode->i_op = &page_symlink_inode_operations; | 60 | inode->i_op = &page_symlink_inode_operations; |
61 | inode->i_mapping->a_ops = &jfs_aops; | 61 | inode->i_mapping->a_ops = &jfs_aops; |
62 | } else | 62 | } else { |
63 | inode->i_op = &jfs_symlink_inode_operations; | 63 | inode->i_op = &jfs_symlink_inode_operations; |
64 | /* | ||
65 | * The inline data should be null-terminated, but | ||
66 | * don't let on-disk corruption crash the kernel | ||
67 | */ | ||
68 | JFS_IP(inode)->i_inline[inode->i_size] = '\0'; | ||
69 | } | ||
64 | } else { | 70 | } else { |
65 | inode->i_op = &jfs_file_inode_operations; | 71 | inode->i_op = &jfs_file_inode_operations; |
66 | init_special_inode(inode, inode->i_mode, inode->i_rdev); | 72 | init_special_inode(inode, inode->i_mode, inode->i_rdev); |