The branch stable/11 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6d0a2f9d2ffce3d94c9a523d7779f791355d3677
commit 6d0a2f9d2ffce3d94c9a523d7779f791355d3677 Author: Mark Johnston <[email protected]> AuthorDate: 2020-12-27 21:52:30 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2021-01-18 19:13:44 +0000 msdosfs: Fix a leak of dirent padding bytes This was missed in r340856 / commit 6d2e2df764199f0a15fd743e79599391959cc17d. Three bytes from the kernel stack may be leaked when reading directory entries. Reported by: Syed Faraz Abrar <[email protected]> Sponsored by: The FreeBSD Foundation (cherry picked from commit 599f90446376370eb365a0fde857ea2b5766873a) --- sys/fs/msdosfs/msdosfs_vnops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index d8274f66635b..e747e47fecb5 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1701,6 +1701,7 @@ msdosfs_readdir(struct vop_readdir_args *ap) mbnambuf_flush(&nb, &dirbuf); chksum = -1; dirbuf.d_reclen = GENERIC_DIRSIZ(&dirbuf); + dirent_terminate(&dirbuf); if (uio->uio_resid < dirbuf.d_reclen) { brelse(bp); goto out; _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
