Merge tag 'xfs-fixes-6.18-rc7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

torvalds · torvalds · commit 89edd36fd801 · 2025-11-22T10:23:34.000-08:00
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
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ xrep_symlink_salvage_inline(`
`184`	`184`	`sc->ip->i_disk_size == 1 && old_target[0] == '?')`
`185`	`185`	`return 0;`
`186`	`186`
`187`		`- nr = min(XFS_SYMLINK_MAXLEN, xfs_inode_data_fork_size(ip));`
	`187`	`+ nr = min(XFS_SYMLINK_MAXLEN, ifp->if_bytes);`
`188`	`188`	`memcpy(target_buf, ifp->if_data, nr);`
`189`	`189`	`return nr;`
`190`	`190`	`}`