Skip to contentSkip to conversation

xfs: verify inline directory data forks

DISCUSSION Geert Uytterhoeven 1 participant 1 message Mar 20, 2017 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 23 lines · Linux Kernel Mailing List
Web:        https://git.kernel.org/torvalds/c/630a04e79dd41ff746b545d4fc052e0abb836120
Commit:     630a04e79dd41ff746b545d4fc052e0abb836120
Parent:     2fcc319d2467a5f5b78f35f79fd6e22741a31b1e
Refname:    refs/heads/master
Author:     Darrick J. Wong <[email protected]>
AuthorDate: Wed Mar 15 00:24:25 2017 -0700
Committer:  Darrick J. Wong <[email protected]>
CommitDate: Wed Mar 15 00:24:25 2017 -0700

xfs: verify inline directory data forks

When we're reading or writing the data fork of an inline directory, check the contents to make sure we're not overflowing buffers or eating garbage data. xfs/348 corrupts an inline symlink into an inline directory, triggering a buffer overflow bug.

fs/xfs/libxfs/xfs_dir2_sf.c +1 -0
 
+/* Verify the consistency of an inline directory. */

fs/xfs/libxfs/xfs_dir2_sf.c

Quoted 10 lines
fs/xfs/libxfs/xfs_dir2_sf.c +9 -0
+int
+xfs_dir2_sf_verify(
+       struct xfs_mount                *mp,
+       struct xfs_dir2_sf_hdr          *sfp,
+       int                             size)
+{
 
+               /* Don't allow names with known bad length. */
+               XFS_WANT_CORRUPTED_RETURN(mp, sfep->namelen > 0);
+               XFS_WANT_CORRUPTED_RETURN(mp, sfep->namelen < MAXNAMELEN);

With gcc 4.1.2:

fs/xfs/libxfs/xfs_dir2_sf.c: In function ‘xfs_dir2_sf_verify’:
fs/xfs/libxfs/xfs_dir2_sf.c:680: warning: comparison is always true due to limited range of data type

As sfep->namelen is __u8, and MAXNAMELEN = 256, none of the two checks above can be true.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds