From patchwork Mon Jan 9 13:06:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9504589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A6378606E1 for ; Mon, 9 Jan 2017 13:09:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A06B2284BB for ; Mon, 9 Jan 2017 13:09:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 958F4284C7; Mon, 9 Jan 2017 13:09:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AAD0284CA for ; Mon, 9 Jan 2017 13:09:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761235AbdAINHy (ORCPT ); Mon, 9 Jan 2017 08:07:54 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33143 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937976AbdAINGq (ORCPT ); Mon, 9 Jan 2017 08:06:46 -0500 Received: by mail-wm0-f68.google.com with SMTP id r144so13204641wme.0 for ; Mon, 09 Jan 2017 05:06:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sqvjMvEiwvDCNfBLtTQsLEikao2/fWXZqehKl0WvGMg=; b=FcM9VVd7twNg6NLD9oJ0iLt1ffOfVocS5WqTxxdPcks1my0DhCSTCKZ3RjeAx9SZde wQKpRFPnbGk9LzW2bAPbndnFc7j0w2O1h3c3b5WqZ3/1q7poTnIOez3NP5Wjckfyjvtx SjXtOKa9jHHySdfp+DWX5Ig3fe19fCdpXhB7WRaXckmCB3So7dmsph8FSh+nupBouv/U 446go3vD+vQrxvfF4Pc+B8ZTXnrT7b/XMQKK0vba6ZQa2KmfdhXh///P3AxbIN3AO9Eq VQRKXaMwSacAW2IXqYORBgNlhWDFXoJznR5tTv9Skgdl0SWVkHttKnviMpmf02F7RqW0 ah5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sqvjMvEiwvDCNfBLtTQsLEikao2/fWXZqehKl0WvGMg=; b=Rzf//IKsfI4Bl0LxDwECsJHVrxvcACb78EX1cr3HdApajni+U0LLOOFQzGMX2ODyjM N999XPLaUFgReBqO8dhB5aPUDSTosfx3jOzwdQ0ZeYOx326D4JSVGUXGseCuG2H1qpYC IsLvlhHLiVjuZjesr09YcJAVFQTKhBRAM48fxaTPBXewv9fyUBvPyvXQTWMcKqk1e5gW L/smmWzOwN4nRn3IKlBcf1AxG6iyjvhXwckLZKyH9f35zm8yokArh8mGhVDheib5uAxo RXSx9WIy1n/1r/LZ/16L/R4u1rS5kgVL8ucq6l3HUKjq7k3xh260Aw2Vy5zGj52W/C1J w6Nw== X-Gm-Message-State: AIkVDXLCvgwAPcJt9mn1Ak/1X4Vjk7P/OJFPVPi9MVJABdbo3rInlgk8O6lnSj8EnQNlZQ== X-Received: by 10.28.155.202 with SMTP id d193mr5083098wme.38.1483967205066; Mon, 09 Jan 2017 05:06:45 -0800 (PST) Received: from amir-VirtualBox.ctera.local (bzq-82-81-193-202.cablep.bezeqint.net. [82.81.193.202]) by smtp.gmail.com with ESMTPSA id js10sm123713661wjb.19.2017.01.09.05.06.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jan 2017 05:06:44 -0800 (PST) From: Amir Goldstein To: "Darrick J . Wong" Cc: Brian Foster , linux-xfs@vger.kernel.org Subject: [PATCH v6 2/3] xfs: sanity check directory inode di_size Date: Mon, 9 Jan 2017 15:06:28 +0200 Message-Id: <1483967189-27313-3-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483967189-27313-1-git-send-email-amir73il@gmail.com> References: <1483967189-27313-1-git-send-email-amir73il@gmail.com> Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This changes fixes an assertion hit when fuzzing on-disk i_mode values. The easy case to fix is when changing an empty file i_mode to S_IFDIR. In this case, xfs_dinode_verify() detects an illegal zero size for directory and fails to load the inode structure from disk. For the case of non empty file whose i_mode is changed to S_IFDIR, the ASSERT() statement in xfs_dir2_isblock() is replaced with return -EFSCORRUPTED as suggested by Darrick, to avoid interacting with corrupted jusk also when XFS_DEBUG is disabled. Suggested-by: Darrick J. Wong Signed-off-by: Amir Goldstein Reviewed-by: Christoph Hellwig --- fs/xfs/libxfs/xfs_dir2.c | 3 ++- fs/xfs/libxfs/xfs_inode_buf.c | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c index 48d7c45..3f73f49 100644 --- a/fs/xfs/libxfs/xfs_dir2.c +++ b/fs/xfs/libxfs/xfs_dir2.c @@ -631,7 +631,8 @@ xfs_dir2_isblock( if ((rval = xfs_bmap_last_offset(args->dp, &last, XFS_DATA_FORK))) return rval; rval = XFS_FSB_TO_B(args->dp->i_mount, last) == args->geo->blksize; - ASSERT(rval == 0 || args->dp->i_d.di_size == args->geo->blksize); + if (rval != 0 && args->dp->i_d.di_size != args->geo->blksize) + return -EFSCORRUPTED; *vp = rval; return 0; } diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index dd483e2..0091ac3 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c @@ -386,6 +386,7 @@ xfs_dinode_verify( xfs_ino_t ino, struct xfs_dinode *dip) { + uint16_t mode; uint16_t flags; uint64_t flags2; @@ -396,8 +397,10 @@ xfs_dinode_verify( if (be64_to_cpu(dip->di_size) & (1ULL << 63)) return false; - /* No zero-length symlinks. */ - if (S_ISLNK(be16_to_cpu(dip->di_mode)) && dip->di_size == 0) + mode = be16_to_cpu(dip->di_mode); + + /* No zero-length symlinks/dirs. */ + if ((S_ISLNK(mode) || S_ISDIR(mode)) && dip->di_size == 0) return false; /* only version 3 or greater inodes are extensively verified here */