From: Prasanna S. Panchamukhi <ppanchamukhi@xxxxxxxxxxxx>
Ensure fast symlink targets are NUL-terminated, even if corrupted
on-disk.
This patch has been back ported from upstream
commit b5ed3112b5f74c8ec1c7aa03a76c596635e85197.
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Stephen Tweedie <sct@xxxxxxxxxx>
Cc: linux-ext4@xxxxxxxxxxxxxxx
Signed-off-by: Duane Griffin <duaneg@xxxxxxxxx>
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
BugID: 68873
Signed-off-by: Prasanna S. Panchamukhi <ppanchamukhi@xxxxxxxxxxxx>
---
fs/ext3/inode.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 67d0af8..d669d78 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -36,6 +36,7 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
#include <linux/uio.h>
+#include <linux/namei.h>
#include "xattr.h"
#include "acl.h"
@@ -2481,9 +2482,11 @@ void ext3_read_inode(struct inode * inode)
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);
}
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
