diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-22 10:23:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-22 10:23:34 -0800 |
| commit | 89edd36fd801efdb3d2f38bbf7791a293c24bb45 (patch) | |
| tree | 22fd5e15be768c05197d16cefc23271cf14dfa1a | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/... (diff) | |
| parent | xfs: fix out of bounds memory read error in symlink repair (diff) | |
| download | linux-89edd36fd801efdb3d2f38bbf7791a293c24bb45.tar.gz linux-89edd36fd801efdb3d2f38bbf7791a293c24bb45.zip | |
Merge tag 'xfs-fixes-6.18-rc7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fix from Carlos Maiolino:
"A single out-of-bounds fix, nothing special"
* tag 'xfs-fixes-6.18-rc7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: fix out of bounds memory read error in symlink repair
| -rw-r--r-- | fs/xfs/scrub/symlink_repair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/scrub/symlink_repair.c b/fs/xfs/scrub/symlink_repair.c index 5902398185a8..df629892462f 100644 --- a/fs/xfs/scrub/symlink_repair.c +++ b/fs/xfs/scrub/symlink_repair.c @@ -184,7 +184,7 @@ xrep_symlink_salvage_inline( sc->ip->i_disk_size == 1 && old_target[0] == '?') return 0; - nr = min(XFS_SYMLINK_MAXLEN, xfs_inode_data_fork_size(ip)); + nr = min(XFS_SYMLINK_MAXLEN, ifp->if_bytes); memcpy(target_buf, ifp->if_data, nr); return nr; } |