summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2024-12-28 12:55:17 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-02-01 18:39:37 +0100
commit1c3cf02db81021a0c93b327449115c1f80276ab9 (patch)
tree0c98b463c6952b2aba4377df90e83bb7b125ee51
parent4516febe325342555bb09ca5b396fb816d655821 (diff)
downloadlinux-1c3cf02db81021a0c93b327449115c1f80276ab9.tar.gz
linux-1c3cf02db81021a0c93b327449115c1f80276ab9.tar.bz2
linux-1c3cf02db81021a0c93b327449115c1f80276ab9.zip
libfs: Return ENOSPC when the directory offset range is exhausted
commit 903dc9c43a155e0893280c7472d4a9a3a83d75a6 upstream. 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: stable@vger.kernel.org # v6.9+ Reviewed-by: Jeff Layton <jlayton@kernel.org> Reviewed-by: Yang Erkun <yangerkun@huawei.com> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Link: https://lore.kernel.org/r/20241228175522.1854234-2-cel@kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/libfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/libfs.c b/fs/libfs.c
index 46966fd8bcf9..f803d440ce39 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -288,8 +288,8 @@ 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)
- return ret;
+ if (unlikely(ret < 0))
+ return ret == -EBUSY ? -ENOSPC : ret;
offset_set(dentry, offset);
return 0;