| From 19ea80603715d473600cd993b9987bc97d042e02 Mon Sep 17 00:00:00 2001 |
| From: Theodore Ts'o <tytso@mit.edu> |
| Date: Sun, 16 Feb 2014 19:29:32 -0500 |
| Subject: ext4: don't leave i_crtime.tv_sec uninitialized |
| |
| From: Theodore Ts'o <tytso@mit.edu> |
| |
| 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 <vegard.nossum@oracle.com> |
| Tested-by: Vegard Nossum <vegard.nossum@oracle.com> |
| Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/ext4/ext4.h | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/fs/ext4/ext4.h |
| +++ b/fs/ext4/ext4.h |
| @@ -771,6 +771,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); \ |
