Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19ea8060 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: don't leave i_crtime.tv_sec uninitialized 



If the i_crtime field is not present in the inode, don't leave the
field uninitialized.

Fixes: ef7f3835 ("ext4: Add nanosecond timestamps")
Reported-by: default avatarVegard Nossum <vegard.nossum@oracle.com>
Tested-by: default avatarVegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
parent 3d2660d0

fs/ext4/ext4.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -771,6 +771,8 @@ do { \ 
	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime))		       \

	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime))		       \

		(einode)->xtime.tv_sec = 				       \

		(einode)->xtime.tv_sec = 				       \

			(signed)le32_to_cpu((raw_inode)->xtime);	       \

			(signed)le32_to_cpu((raw_inode)->xtime);	       \

	else								       \

		(einode)->xtime.tv_sec = 0;				       \

	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra))	       \

	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra))	       \

		ext4_decode_extra_time(&(einode)->xtime,		       \

		ext4_decode_extra_time(&(einode)->xtime,		       \

				       raw_inode->xtime ## _extra);	       \

				       raw_inode->xtime ## _extra);	       \