From: Theodore Ts'o Date: Mon, 17 Feb 2014 00:29:32 +0000 (-0500) Subject: ext4: don't leave i_crtime.tv_sec uninitialized X-Git-Tag: firefly_0821_release~3679^2~2753 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0c9f21983490feb5637990d719e729bf77b99bd1;p=firefly-linux-kernel-4.4.55.git ext4: don't leave i_crtime.tv_sec uninitialized commit 19ea80603715d473600cd993b9987bc97d042e02 upstream. If the i_crtime field is not present in the inode, don't leave the field uninitialized. Fixes: ef7f38359 ("ext4: Add nanosecond timestamps") Reported-by: Vegard Nossum Tested-by: Vegard Nossum Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 7bb2e2e55123..790b14c5f262 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -774,6 +774,8 @@ do { \ if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime)) \ (einode)->xtime.tv_sec = \ (signed)le32_to_cpu((raw_inode)->xtime); \ + else \ + (einode)->xtime.tv_sec = 0; \ if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra)) \ ext4_decode_extra_time(&(einode)->xtime, \ raw_inode->xtime ## _extra); \