From: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date: Tue, 16 Dec 2008 16:21:34 +0000 (-0600)
Subject: jfs: ensure symlinks are NUL-terminated
X-Git-Tag: v2.6.29-rc1~562^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d69e83d99cf87e3328c47bb54684360e32aef17d;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 210339784b5..b00ee9f05a0 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);