Commit b12903f1 authored by Duane Griffin's avatar Duane Griffin Committed by Al Viro
Browse files

ufs: ensure fast symlinks are NUL-terminated 



Ensure fast symlink targets are NUL-terminated, even if corrupted
on-disk.

Signed-off-by: default avatarDuane Griffin <duaneg@dghda.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f33219b7

fs/ufs/inode.c

+4 −2
Original line number Diff line number Diff line
@@ -658,7 +658,8 @@ static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode) 
		       sizeof(ufs_inode->ui_u2.ui_addr));

	} else {

		memcpy(ufsi->i_u1.i_symlink, ufs_inode->ui_u2.ui_symlink,

		       sizeof(ufs_inode->ui_u2.ui_symlink));

		       sizeof(ufs_inode->ui_u2.ui_symlink) - 1);

		ufsi->i_u1.i_symlink[sizeof(ufs_inode->ui_u2.ui_symlink) - 1] = 0;

	}

	return 0;

}
@@ -706,7 +707,8 @@ static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode) 
		       sizeof(ufs2_inode->ui_u2.ui_addr));

	} else {

		memcpy(ufsi->i_u1.i_symlink, ufs2_inode->ui_u2.ui_symlink,

		       sizeof(ufs2_inode->ui_u2.ui_symlink));

		       sizeof(ufs2_inode->ui_u2.ui_symlink) - 1);

		ufsi->i_u1.i_symlink[sizeof(ufs2_inode->ui_u2.ui_symlink) - 1] = 0;

	}

	return 0;

}