From patchwork Thu Aug 24 07:43:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: cheng.lin130@zte.com.cn X-Patchwork-Id: 136789 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp993431vqm; Thu, 24 Aug 2023 02:23:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbp3mwTqvgdsjbjNnORyk98WaqKpWNi0SnGrdqxBywANeGto0cU5SdqDo0XzflcldcgKN1 X-Received: by 2002:a05:6a00:24d5:b0:66a:365c:a0e6 with SMTP id d21-20020a056a0024d500b0066a365ca0e6mr13443348pfv.13.1692869039064; Thu, 24 Aug 2023 02:23:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692869039; cv=none; d=google.com; s=arc-20160816; b=IjsMhMubwUq0gxsFM3oSGgdrWlEPjRE1l6Mhe0WWzB0lmMDJvYeMvd9rpbHM98liUh X6b+N+CPn+qxkH1+1qESg/bwKhMlK9AgtpJD2dDqpYAAf6L2EGfgYhdFSMSKOkwWMdzO vrlUXtaceP6IGNvWKprXWmkvpXmmwtcOrok5YTxxj/OETNJeDzef7CG+6gi1xrctXi7/ gyxtSwJJaKVrTaL7WpFQETl3EBlbLuPH6ub4XReDnwQi4VDjUsHHWaZnYOsK6a2ytTUw p3NoChaQ06hLZzRjTAggSc8/obkZp/IrT4fIOaUz5nLEZFiRneqVkq7vj86eTOiqTA+d aXTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=wCKuJK8mP3PID92Jif6Sr/hOFphJsHvKSVNkD/99Akg=; fh=i8EsxL4E3LvPsiDtvNzZDTJK1oYS0tRBfaasXb273YA=; b=P7qwhhJW79Oi7GyDS5wanBDS6Hbuj+rdKX5mVU/hxs/OUaEGH8wcvwAI/KbQnIwnY5 9TD/WZNSGJwnzDQq5dop/adlPuJ1XaSKni0k7i7fct6btDxQpI31rAsTByh8gQB1M23z +cyB5p41Oi71Nwg8oHyEC1ntOc5MpmNnbsHZKVkvx71dWhz9aWzSOyF/d2N8XaXOMpXP 3tGveGN8CabH1veY9HGcdfNi2VKbshIdt+MvYwrmxAHegtm+iniMXekX5Mt+hQ8POzAK rvBbcWZxhb8LllI2YFym1RtD1a52WxWmQtA0eULpN7XHMJ41lAk7gof9BWvCKLIz5frD OacQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l193-20020a6391ca000000b0056963f23048si10456701pge.84.2023.08.24.02.23.45; Thu, 24 Aug 2023 02:23:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233530AbjHXHoj (ORCPT + 99 others); Thu, 24 Aug 2023 03:44:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240436AbjHXHob (ORCPT ); Thu, 24 Aug 2023 03:44:31 -0400 Received: from mxct.zte.com.cn (mxct.zte.com.cn [58.251.27.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4D6510D0; Thu, 24 Aug 2023 00:44:27 -0700 (PDT) Received: from mxde.zte.com.cn (unknown [10.35.20.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4RWZpt1Tz2zQ66; Thu, 24 Aug 2023 15:44:22 +0800 (CST) Received: from mxhk.zte.com.cn (unknown [192.168.250.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mxde.zte.com.cn (FangMail) with ESMTPS id 4RWZpT5yCMzBRHKp; Thu, 24 Aug 2023 15:44:01 +0800 (CST) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4RWZpM0vg4z8XrRD; Thu, 24 Aug 2023 15:43:55 +0800 (CST) Received: from szxlzmapp06.zte.com.cn ([10.5.230.252]) by mse-fl2.zte.com.cn with SMTP id 37O7hoQm047164; Thu, 24 Aug 2023 15:43:50 +0800 (+08) (envelope-from cheng.lin130@zte.com.cn) Received: from mapi (szxlzmapp03[null]) by mapi (Zmail) with MAPI id mid14; Thu, 24 Aug 2023 15:43:52 +0800 (CST) Date: Thu, 24 Aug 2023 15:43:52 +0800 (CST) X-Zmail-TransId: 2b0564e70a3801d-0dc13 X-Mailer: Zmail v1.0 Message-ID: <202308241543526473806@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , Subject: =?utf-8?q?=5BPATCH=5D_xfs=3A_introduce_protection_for_drop_nlink?= X-MAIL: mse-fl2.zte.com.cn 37O7hoQm047164 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 64E70A55.000/4RWZpt1Tz2zQ66 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775101845115016833 X-GMAIL-MSGID: 1775101845115016833 From: Cheng Lin An dir nlinks overflow which down form 0 to 0xffffffff, cause the directory to become unusable until the next xfs_repair run. Introduce protection for drop nlink to reduce the impact of this. And produce a warning for directory nlink error during remove. Signed-off-by: Cheng Lin --- fs/xfs/xfs_inode.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 9e62cc5..536dbe4 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -919,6 +919,15 @@ STATIC int xfs_iunlink_remove(struct xfs_trans *tp, struct xfs_perag *pag, xfs_trans_t *tp, xfs_inode_t *ip) { + xfs_mount_t *mp; + + if (VFS_I(ip)->i_nlink == 0) { + mp = ip->i_mount; + xfs_warn(mp, "%s: Deleting inode %llu with no links.", + __func__, ip->i_ino); + return 0; + } + xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG); drop_nlink(VFS_I(ip)); @@ -2442,7 +2451,12 @@ STATIC int xfs_iunlink_remove(struct xfs_trans *tp, struct xfs_perag *pag, */ if (is_dir) { ASSERT(VFS_I(ip)->i_nlink >= 2); - if (VFS_I(ip)->i_nlink != 2) { + if (VFS_I(ip)->i_nlink < 2) { + xfs_warn(ip->i_mount, + "%s: Remove dir (inode %llu) with invalid links.", + __func__, ip->i_ino); + } + if (VFS_I(ip)->i_nlink > 2) { error = -ENOTEMPTY; goto out_trans_cancel; }