fix bug in add-support-collapse-range
[ext4-patch-queue.git] / dont-leave-crtime-uninitialized
blob798ccd636e978cabdc61d81ba3470adfb0d379ee
1 ext4: don't leave i_crtime.tv_sec uninitialized
3 If the i_crtime field is not present in the inode, don't leave the
4 field uninitialized.
6 Fixes: ef7f38359 ("ext4: Add nanosecond timestamps")
7 Reported-by: Vegard Nossum <vegard.nossum@oracle.com>
8 Tested-by: Vegard Nossum <vegard.nossum@oracle.com>
9 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
10 Cc: stable@vger.kernel.org
11 ---
12  fs/ext4/ext4.h | 2 ++
13  1 file changed, 2 insertions(+)
15 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
16 index ece5556..d3a534f 100644
17 --- a/fs/ext4/ext4.h
18 +++ b/fs/ext4/ext4.h
19 @@ -771,6 +771,8 @@ do {                                                                               \
20         if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime))                      \
21                 (einode)->xtime.tv_sec =                                       \
22                         (signed)le32_to_cpu((raw_inode)->xtime);               \
23 +       else                                                                   \
24 +               (einode)->xtime.tv_sec = 0;                                    \
25         if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra))            \
26                 ext4_decode_extra_time(&(einode)->xtime,                       \
27                                        raw_inode->xtime ## _extra);            \