From patchwork Wed Apr 20 02:07:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: prasanna.panchamukhi@riverbed.com X-Patchwork-Id: 92075 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 51846B6FCF for ; Wed, 20 Apr 2011 12:07:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753247Ab1DTCHx (ORCPT ); Tue, 19 Apr 2011 22:07:53 -0400 Received: from eng.riverbed.com ([208.70.196.44]:6813 "EHLO smtp2.riverbed.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752812Ab1DTCHx (ORCPT ); Tue, 19 Apr 2011 22:07:53 -0400 Received: from unknown (HELO tlssmtp) ([10.16.4.52]) by smtp2.riverbed.com with ESMTP; 19 Apr 2011 19:07:52 -0700 Received: from localhost.localdomain (unknown [216.52.20.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tlssmtp (Postfix) with ESMTP id 489E96BA4E; Tue, 19 Apr 2011 19:07:52 -0700 (PDT) From: prasanna.panchamukhi@riverbed.com To: prasanna.panchamukhi@riverbed.com Cc: Andrew Morton , Stephen Tweedie , linux-ext4@vger.kernel.org Subject: [PATCH 4/4] ext3: ensure fast symlinks are NUL-terminated Date: Tue, 19 Apr 2011 19:07:40 -0700 Message-Id: <1303265260-9210-4-git-send-email-prasanna.panchamukhi@riverbed.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1303265260-9210-1-git-send-email-prasanna.panchamukhi@riverbed.com> References: <1303265260-9210-1-git-send-email-prasanna.panchamukhi@riverbed.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Prasanna S. Panchamukhi Ensure fast symlink targets are NUL-terminated, even if corrupted on-disk. This patch has been back ported from upstream commit b5ed3112b5f74c8ec1c7aa03a76c596635e85197. Cc: Andrew Morton Cc: Stephen Tweedie Cc: linux-ext4@vger.kernel.org Signed-off-by: Duane Griffin Signed-off-by: Al Viro BugID: 68873 Signed-off-by: Prasanna S. Panchamukhi --- fs/ext3/inode.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 67d0af8..d669d78 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -36,6 +36,7 @@ #include #include #include +#include #include "xattr.h" #include "acl.h" @@ -2481,9 +2482,11 @@ void ext3_read_inode(struct inode * inode) inode->i_op = &ext3_dir_inode_operations; inode->i_fop = &ext3_dir_operations; } else if (S_ISLNK(inode->i_mode)) { - if (ext3_inode_is_fast_symlink(inode)) + if (ext3_inode_is_fast_symlink(inode)) { inode->i_op = &ext3_fast_symlink_inode_operations; - else { + nd_terminate_link(ei->i_data, inode->i_size, + sizeof(ei->i_data) - 1); + } else { inode->i_op = &ext3_symlink_inode_operations; ext3_set_aops(inode); }