Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754875AbYLSUt4 (ORCPT ); Fri, 19 Dec 2008 15:49:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753539AbYLSUrs (ORCPT ); Fri, 19 Dec 2008 15:47:48 -0500 Received: from kumera.dghda.com ([80.68.90.171]:35310 "EHLO kumera.dghda.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753110AbYLSUro (ORCPT ); Fri, 19 Dec 2008 15:47:44 -0500 From: "Duane Griffin" To: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, Al Viro , Andrew Morton , Duane Griffin , Christoph Hellwig Subject: [PATCH, v5] sysv: ensure fast symlinks are NUL-terminated Date: Fri, 19 Dec 2008 20:47:16 +0000 Message-Id: <1229719638-6982-9-git-send-email-duaneg@dghda.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1229719638-6982-8-git-send-email-duaneg@dghda.com> References: <1229719638-6982-1-git-send-email-duaneg@dghda.com> <1229719638-6982-2-git-send-email-duaneg@dghda.com> <1229719638-6982-3-git-send-email-duaneg@dghda.com> <1229719638-6982-4-git-send-email-duaneg@dghda.com> <1229719638-6982-5-git-send-email-duaneg@dghda.com> <1229719638-6982-6-git-send-email-duaneg@dghda.com> <1229719638-6982-7-git-send-email-duaneg@dghda.com> <1229719638-6982-8-git-send-email-duaneg@dghda.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1374 Lines: 47 Ensure fast symlink targets are NUL-terminated, even if corrupted on-disk. Cc: Christoph Hellwig Cc: Al Viro Signed-off-by: Duane Griffin --- Changes from v4: fixed off-by-one bug in maximum length, as pointed out by Andreas Dilger. fs/sysv/inode.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c index df0d435..3d81bf5 100644 --- a/fs/sysv/inode.c +++ b/fs/sysv/inode.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #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); } -- 1.6.0.4 -- 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/