From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758882AbYLKWg1 (ORCPT ); Thu, 11 Dec 2008 17:36:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757232AbYLKWgP (ORCPT ); Thu, 11 Dec 2008 17:36:15 -0500 Received: from kumera.dghda.com ([80.68.90.171]:41242 "EHLO kumera.dghda.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756040AbYLKWgO (ORCPT ); Thu, 11 Dec 2008 17:36:14 -0500 From: "Duane Griffin" Date: Thu, 11 Dec 2008 22:36:08 +0000 To: Duane Griffin Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Boaz Harrosh , dushistov@mail.ru Subject: [PATCH, v2] ufs: ensure link targets are NUL-terminated Message-ID: <20081211223608.GE18665@dastardly.home.dghda.com> References: <1229022995-9898-3-git-send-email-duaneg@dghda.com> <1229022995-9898-4-git-send-email-duaneg@dghda.com> <1229022995-9898-5-git-send-email-duaneg@dghda.com> <1229022995-9898-6-git-send-email-duaneg@dghda.com> <1229022995-9898-7-git-send-email-duaneg@dghda.com> <1229022995-9898-8-git-send-email-duaneg@dghda.com> <1229022995-9898-9-git-send-email-duaneg@dghda.com> <1229022995-9898-10-git-send-email-duaneg@dghda.com> <1229022995-9898-11-git-send-email-duaneg@dghda.com> <1229022995-9898-12-git-send-email-duaneg@dghda.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1229022995-9898-12-git-send-email-duaneg@dghda.com> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ensure link targets are NUL-terminated, even if corrupted on-disk. Signed-off-by: Duane Griffin --- V2: terminate when the link is read instead of every time it is followed, as suggested by Dave Kleikamp. diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index 39f8778..a22f64d 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -606,9 +606,11 @@ static void ufs_set_inode_ops(struct inode *inode) inode->i_fop = &ufs_dir_operations; inode->i_mapping->a_ops = &ufs_aops; } else if (S_ISLNK(inode->i_mode)) { - if (!inode->i_blocks) + if (!inode->i_blocks) { + char *link = UFS_I(inode)->i_u1.i_symlink; inode->i_op = &ufs_fast_symlink_inode_operations; - else { + link[inode->i_size] = '\0'; + } else { inode->i_op = &page_symlink_inode_operations; inode->i_mapping->a_ops = &ufs_aops; } -- "I never could learn to drink that blood and call it wine" - Bob Dylan