From patchwork Wed Sep 2 16:40:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11751299 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3388F14E5 for ; Wed, 2 Sep 2020 16:40:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 16D49207EA for ; Wed, 2 Sep 2020 16:40:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="HITl78w8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726814AbgIBQkQ (ORCPT ); Wed, 2 Sep 2020 12:40:16 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:59554 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726526AbgIBQkP (ORCPT ); Wed, 2 Sep 2020 12:40:15 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 082Gdx1T132436 for ; Wed, 2 Sep 2020 16:40:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : subject : message-id : mime-version : content-type; s=corp-2020-01-29; bh=a1dFYZrprKt4kwyxkcXkFm22LO+uZ4d57eCWv/rudXg=; b=HITl78w8Yi6ci3TQdTHIo+2Ljj6Lwf6xQGRfS8scjupM38ixKwyp9puvhZYMt2YHO2+A 63uLAnmzJIdGN1m2wJ/c+z51kHoSXSxuZsJsHW/TQ1S4i12OIFVCaGL+KWHnSl780my9 PsuJNc9Wq0Y0eu3xGvZWchyelvi8stoczOwtmZ1H8Q5w8f0CcWO9gANiFvG56whAVmTN Kjb9rk7mh50E/Ax3UDksCj1TjlBOzH7EgUununde5gfSbWgEZS17VZYiVnzrCcqs3YPK wOXKKOqLAsVdxRsF4cw0Ti86EJvREXSv5HWac7NM/RU0Bu6eqJXcNR5aFR4d2Zd1FxEm HA== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2120.oracle.com with ESMTP id 339dmn284e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 02 Sep 2020 16:40:14 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 082GZERr184705 for ; Wed, 2 Sep 2020 16:40:13 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3030.oracle.com with ESMTP id 3380kq9hxy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 02 Sep 2020 16:40:13 +0000 Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 082GeDM1007093 for ; Wed, 2 Sep 2020 16:40:13 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 02 Sep 2020 09:40:13 -0700 Date: Wed, 2 Sep 2020 09:40:12 -0700 From: "Darrick J. Wong" To: xfs Subject: [PATCH] xfs: fix xfs_bmap_validate_extent_raw when checking attr fork of rt files Message-ID: <20200902164012.GN6096@magnolia> MIME-Version: 1.0 Content-Disposition: inline X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9732 signatures=668679 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 adultscore=0 mlxscore=0 suspectscore=1 malwarescore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2009020158 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9732 signatures=668679 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 mlxlogscore=999 adultscore=0 impostorscore=0 mlxscore=0 suspectscore=1 spamscore=0 clxscore=1015 malwarescore=0 lowpriorityscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2009020159 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong The realtime flag only applies to the data fork, so don't use the realtime block number checks on the attr fork of a realtime file. Fixes: 30b0984d9117 ("xfs: refactor bmap record validation") Signed-off-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_bmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index ce2e702b6b43..d35250c9bb07 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -6310,7 +6310,7 @@ xfs_bmap_validate_extent_raw( xfs_fsblock_t endfsb; endfsb = irec->br_startblock + irec->br_blockcount - 1; - if (isrt) { + if (isrt && whichfork == XFS_DATA_FORK) { if (!xfs_verify_rtbno(mp, irec->br_startblock)) return __this_address; if (!xfs_verify_rtbno(mp, endfsb))