Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758783AbYLKWY1 (ORCPT ); Thu, 11 Dec 2008 17:24:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758651AbYLKWYH (ORCPT ); Thu, 11 Dec 2008 17:24:07 -0500 Received: from kumera.dghda.com ([80.68.90.171]:39525 "EHLO kumera.dghda.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758087AbYLKWYF (ORCPT ); Thu, 11 Dec 2008 17:24:05 -0500 From: "Duane Griffin" Date: Thu, 11 Dec 2008 22:23:59 +0000 To: Duane Griffin Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Boaz Harrosh , linux-ext4@vger.kernel.org Subject: [PATCH, v2] ext2: ensure link targets are NUL-terminated Message-ID: <20081211222359.GA18665@dastardly.home.dghda.com> References: <1229022995-9898-1-git-send-email-duaneg@dghda.com> <1229022995-9898-2-git-send-email-duaneg@dghda.com> <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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1229022995-9898-5-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 Content-Length: 1195 Lines: 32 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/ext2/inode.c b/fs/ext2/inode.c index 7658b33..9bacf35 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -1286,9 +1286,10 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino) else inode->i_mapping->a_ops = &ext2_aops; } else if (S_ISLNK(inode->i_mode)) { - if (ext2_inode_is_fast_symlink(inode)) + if (ext2_inode_is_fast_symlink(inode)) { inode->i_op = &ext2_fast_symlink_inode_operations; - else { + ((char *) ei->i_data)[inode->i_size] = '\0'; + } else { inode->i_op = &ext2_symlink_inode_operations; if (test_opt(inode->i_sb, NOBH)) inode->i_mapping->a_ops = &ext2_nobh_aops; -- "I never could learn to drink that blood and call it wine" - Bob Dylan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/