From patchwork Sun Nov 17 21:32:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13877969 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48906D10F2F for ; Sun, 17 Nov 2024 21:32:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE53B8D001A; Sun, 17 Nov 2024 16:32:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E49148D0018; Sun, 17 Nov 2024 16:32:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE6A88D001A; Sun, 17 Nov 2024 16:32:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id ABA228D0018 for ; Sun, 17 Nov 2024 16:32:26 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5AA2C80110 for ; Sun, 17 Nov 2024 21:32:26 +0000 (UTC) X-FDA: 82796883834.27.874AD0C Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf11.hostedemail.com (Postfix) with ESMTP id B7DF24000B for ; Sun, 17 Nov 2024 21:31:24 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=YwLmSCsh; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of cel@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=cel@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731879054; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9bhJfmmX8eWLULpBVOq7lXLXxEaVv114s3PiBizSr28=; b=7yntxsG9VLbjA7zUw/Q38ySMoz98TdrB5iNE2nHT/+vm5nxwXovNhFNrMg/8mGQNZEKtvA e6hjMAsjoVOVQpDa/Ierq9sLKynlplUyaa9uioh+9Zfs38sfn/tPOeMlEyFzPz/jQ/tlUP tFbehaifuYyqYk/niT/S91v9iFFny3c= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=YwLmSCsh; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of cel@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=cel@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731879054; a=rsa-sha256; cv=none; b=zfwWTsEfs2KNNr7o02/U4GJPXxE5ulPRuzTRK0yjbxrOxwadoMRmQESRNeiiNeBKzx/NVJ Xuge5fsDqGIWHSkuwHPMYi4aNGI0mVIygOKZAfFGw2n3koHG60veze3BDy7S+SoLqU5493 bJVWxABoXrK4BPQ2yPtGD4+jm19ZZgo= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 5F26AA41081; Sun, 17 Nov 2024 21:30:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14632C4CED8; Sun, 17 Nov 2024 21:32:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731879143; bh=uhgh93plhiFV1pHFjFAu6nt5SYYT8N+YCq9mpcqsLXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YwLmSCshoiCMBHQ8SdisMNZY5nlg2cAQVDgmOSPyURaXMQ4aCumx3TQV0KV/+aF0d nY4VP9HmKvlqTs/RX9o2Z1gCH0tU7BiqNXsFXj5+AnT546vfGt5QpnRiK29A8edJoB GwoKdrdVbhYnlwkXxdzVH3PDZ3CIOFJxcLxZhjtoqOVrmnCBWJqV47cbz23wZ8Fhjt 4+Y/fD9zKUvNuY4hTnlGY+ssNQ5Bp0O0X00VooV2Hr7/PAuer8xTbU1F32iEz5F4+x q6Y+uvCsWTU5LKrqqnCg9dgroyUS3FYb8wZG0msfJ4XmRLA9qWnZHFzGFhRfR9kgtV NK7InFdZjg3lg== From: cel@kernel.org To: , , Hugh Dickens Cc: yukuai3@huawei.com, yangerkun@huaweicloud.com, Chuck Lever , stable@vger.kernel.org Subject: [RFC PATCH 1/2] libfs: Return ENOSPC when the directory offset range is exhausted Date: Sun, 17 Nov 2024 16:32:05 -0500 Message-ID: <20241117213206.1636438-2-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241117213206.1636438-1-cel@kernel.org> References: <20241117213206.1636438-1-cel@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: B7DF24000B X-Stat-Signature: a8aabuzq67775yromokk39cgw3n4xih8 X-HE-Tag: 1731879084-832957 X-HE-Meta: U2FsdGVkX18N72jid8Lp/oNSxfvejAL4Wnj1EvJHZW1rbTsJ7YjcygDAWz+TW/vblVS5Kh9xcXfwHhk2tSge6sz/X0z8GLTokY1GcL8UeylZV7hAqe+ZlbUm0YAFtRU3gmtCZD1lBDSYgYPEhhoLrfy9S4vuN+oXbnjpx0lnwbu4V9LzkhtGUsm1aiXqewnGJcrGTTiNtrn/6K5EVaKfgDHJJaxqRoUlk0hN0p9XIN6vHzoRvSyHUjlt9z+4stHJ/Q7T92QPI8x5nGmcM9+frEoLsRGXTOpKY83Gd8GTe4SWNv6x0kwCg2INMf1K33aq+o4RWIMPo6/niib+Q9dns0Q8JaAKqwyIU2SO9KhbtNgdqqcEywWcG7nF59W9GaJaKLcTYjtARkHX45pPnOLDqfvvQubF++krMpNBHfj85VxgTx25bKdphAl9jA6lOxKEOZdfSzebg28bxPmYTEN3thM2eJBDItWWf2faZW2OVaJSbnNzORSZGTlnbc3W5NabR6wbdhFylQ5jq3JbeTaAHmQclyvk9jqO/7OiXn+DTlC1E2B1FWNPjww0bXE6sNpamTprnZH7z3nKoCbcz5zFLzbr9vDasKfLjznmMvmCywXbpZLWRw5zPBTvboBEEauRvE7Cwogp4amXKxLeAJIZUbm2CgMbiRoPz8Heb43apQiT5AR8uRsGpxejXM1mkaK+r6Aw71Fd8WhF+gaaseWmA7LxDBj8ILK1qTDJ9hwREqk/r7TfRhTAkDgSo/+dM6D9+P7E867vJW8MClJ5tCPSAo7TXCx9lVYH220EgmpyBRR7GJ9AEoAiS3IrjaEcgEBkT7dQIQcJNfu98KlSFKfeH3+x2GEflF2RbaJLhIRQz2edqJ25fZGaWIbpw2T9Xbu9Tk/4dwUuPw621apV0Q040Fd+o9Q1dwnerJZb66PVPWqQPs7Z0QmkKi4XD9KgLGmb9Ri25SjpqpoxOM71ZGF bfRfdlQj YLEquXxF7XHv1v5IG9syKZJPJL05dcVleZbypPLkjmFuIcjthrRtF8k8SvHhVyZCHx0fERPS4nEk9OJ/Ywz/Q18VZsB/OiEZocBKgRUlHhZ67/t2fV83qBEYmxe0XWjXz+UYs2jWg9ZbwBmkmmwlN/kwVJ6UkkrUogNK+h9NCa/yy6UErXooEV5yAP0s8+2TZ8V5eS8WxMYsKJrjv/Mj2w+pSceIbr+JGdABcKeFJFC32ijeC9WBJk8EcYC2xNJXFa/kH X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Chuck Lever Testing shows that the EBUSY error return from mtree_alloc_cyclic() leaks into user space. The ERRORS section of "man creat(2)" says: > EBUSY O_EXCL was specified in flags and pathname refers > to a block device that is in use by the system > (e.g., it is mounted). ENOSPC is closer to what applications expect in this situation. Note that the normal range of simple directory offset values is 2..2^63, so hitting this error is going to be rare to impossible. Fixes: 6faddda69f62 ("libfs: Add directory operations for stable offsets") Cc: # v6.9+ Signed-off-by: Chuck Lever --- fs/libfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/libfs.c b/fs/libfs.c index 46966fd8bcf9..bf67954b525b 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -288,7 +288,9 @@ int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry) ret = mtree_alloc_cyclic(&octx->mt, &offset, dentry, DIR_OFFSET_MIN, LONG_MAX, &octx->next_offset, GFP_KERNEL); - if (ret < 0) + if (unlikely(ret == -EBUSY)) + return -ENOSPC; + if (unlikely(ret < 0)) return ret; offset_set(dentry, offset);