Skip to content

Improve simple directory offset wrap behavior

[email protected] linux-fsdevel linux-mm stable 7 versions – Applied

Status from this message: Applied to the vfs-6.14.libfs branch of the vfs/vfs.git tree.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest5 patches 1 replyApplied
  2. v65 patches 16 repliesApplied
  3. v55 patches 3 repliesSuperseded
Earlier versions · 4
VersionPostedPatchesRepliesStatus
v45 patches7 repliesApplied
v3 RFC5 patches0 repliesSuperseded
v2 RFC5 patches7 repliesSuperseded
v1 RFC2 patches15 repliesApplied

Changes in v7 from the cover letter

- Restrict the directory offset value range to S32_MAX on all platforms

Patches in v7 Applied

#Subject and filesSizeRepliesApplied
1/5libfs: Return ENOSPC when the directory offset range is exhaustedfs/libfs.c+2 -20 replies
2/5Revert "libfs: Add simple_offset_empty()"fs/libfs.c include/linux/fs.h mm/shmem.c+2 -350 replies
3/5Revert "libfs: fix infinite directory reads for offset dir"fs/libfs.c+11 -240 replies
4/5libfs: Replace simple_offset end-of-directory detectionfs/libfs.c+21 -160 replies
5/5libfs: Use d_children list to iterate simple_offset directoriesfs/libfs.c+58 -260 replies

Reviews trailers per patch

1 of 5 patches has a Reviewed-by or Acked-by.

PatchJeff LaytonYang Erkun
1/5R-b R-b
2/5
3/5
4/5
5/5

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v7 thread

Cover letter [PATCH v7 0/5] Improve simple directory offset wrap behavior

From: Chuck Lever <[email protected]>

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/[email protected]/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.

Changes since v6:
- Restrict the directory offset value range to S32_MAX on all platforms

This series (against v6.13-rc4) has been pushed to:

https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git/log/?h=tmpfs-fixes

Chuck Lever (5):
libfs: Return ENOSPC when the directory offset range is exhausted Revert "libfs: Add simple_offset_empty()"
Revert "libfs: fix infinite directory reads for offset dir"
libfs: Replace simple_offset end-of-directory detection
libfs: Use d_children list to iterate simple_offset directories

 fs/libfs.c         | 162 +++++++++++++++++++++------------------------
 include/linux/fs.h |   1 -
 mm/shmem.c         |   4 +-
 3 files changed, 79 insertions(+), 88 deletions(-)
Signature · 1 line
2.47.0