diff options
| author | Christian Brauner <brauner@kernel.org> | 2025-01-04 12:15:58 +0300 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-01-04 12:15:58 +0300 |
| commit | a0634b457eca16b21a4525bc40cd2db80f52dadc (patch) | |
| tree | 246f9f9cb0646838ba355e865244579e3dd65178 /mm/shmem.c | |
| parent | 40384c840ea1944d7c5a392e8975ed088ecf0b37 (diff) | |
| parent | b9b588f22a0c049a14885399e27625635ae6ef91 (diff) | |
| download | linux-a0634b457eca16b21a4525bc40cd2db80f52dadc.tar.xz | |
Merge patch series "Improve simple directory offset wrap behavior"
Chuck Lever <chuck.lever@oracle.com> says:
The purpose of this series is to construct a set of upstream fixes
that can be backported to v6.6 to address CVE-2024-46701.
In response to a reported failure of libhugetlbfs-test.32bit.gethugepagesizes:
https://lore.kernel.org/linux-fsdevel/f996eec0-30e1-4fbf-a936-49f3bedc09e9@oracle.com/T/#t
I've narrowed the range of directory offset values returned by
simple_offset_add() to 3 .. (S32_MAX - 1) on all platforms. This
means the allocation behavior is identical on 32-bit systems, 64-bit
systems, and 32-bit user space on 64-bit kernels. The new range
still permits over 2 billion concurrent entries per directory.
* patches from https://lore.kernel.org/r/20241228175522.1854234-1-cel@kernel.org:
libfs: Use d_children list to iterate simple_offset directories
libfs: Replace simple_offset end-of-directory detection
Revert "libfs: fix infinite directory reads for offset dir"
Revert "libfs: Add simple_offset_empty()"
libfs: Return ENOSPC when the directory offset range is exhausted
Link: https://lore.kernel.org/r/20241228175522.1854234-1-cel@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index ccb9629a0f70..274c2666f457 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3818,7 +3818,7 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry) static int shmem_rmdir(struct inode *dir, struct dentry *dentry) { - if (!simple_offset_empty(dentry)) + if (!simple_empty(dentry)) return -ENOTEMPTY; drop_nlink(d_inode(dentry)); @@ -3875,7 +3875,7 @@ static int shmem_rename2(struct mnt_idmap *idmap, return simple_offset_rename_exchange(old_dir, old_dentry, new_dir, new_dentry); - if (!simple_offset_empty(new_dentry)) + if (!simple_empty(new_dentry)) return -ENOTEMPTY; if (flags & RENAME_WHITEOUT) { |