summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuane Griffin <duaneg@dghda.com>2008-12-19 20:47:16 +0000
committerAl Viro <viro@zeniv.linux.org.uk>2008-12-31 18:07:39 -0500
commit21acaf8e8da00235be59a3e489d5fa2a8721cafc (patch)
tree85db3464bad98d42a37126cada03b3f7a2acb0b1
parente83c1397cafc4e44f868289db5e417463c0d09a4 (diff)
downloadblackbird-op-linux-21acaf8e8da00235be59a3e489d5fa2a8721cafc.tar.gz
blackbird-op-linux-21acaf8e8da00235be59a3e489d5fa2a8721cafc.zip
sysv: ensure fast symlinks are NUL-terminated
Ensure fast symlink targets are NUL-terminated, even if corrupted on-disk. Cc: Christoph Hellwig <hch@infradead.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Duane Griffin <duaneg@dghda.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/sysv/inode.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index df0d435baa48..3d81bf58dae2 100644
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -27,6 +27,7 @@
#include <linux/init.h>
#include <linux/buffer_head.h>
#include <linux/vfs.h>
+#include <linux/namei.h>
#include <asm/byteorder.h>
#include "sysv.h"
@@ -163,8 +164,11 @@ void sysv_set_inode(struct inode *inode, dev_t rdev)
if (inode->i_blocks) {
inode->i_op = &sysv_symlink_inode_operations;
inode->i_mapping->a_ops = &sysv_aops;
- } else
+ } else {
inode->i_op = &sysv_fast_symlink_inode_operations;
+ nd_terminate_link(SYSV_I(inode)->i_data, inode->i_size,
+ sizeof(SYSV_I(inode)->i_data) - 1);
+ }
} else
init_special_inode(inode, inode->i_mode, rdev);
}
OpenPOWER on IntegriCloud