diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-31 02:33:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-31 02:33:33 +0100 |
| commit | 14eeee88bfb439a3dc9449f94c23a21930cbe35b (patch) | |
| tree | 9c87086c2836c475040cb2b6f94421cb92d79014 /fs/jfs | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | jfs: ensure symlinks are NUL-terminated (diff) | |
| download | linux-14eeee88bfb439a3dc9449f94c23a21930cbe35b.tar.xz linux-14eeee88bfb439a3dc9449f94c23a21930cbe35b.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
jfs: ensure symlinks are NUL-terminated
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) 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); |