From: David Turner <novalis@novalis.org>
To: Mark Harris <mhlk@osj.us>
Cc: Andreas Dilger <adilger@dilger.ca>,
"Theodore Ts'o" <tytso@mit.edu>, Jan Kara <jack@suse.cz>,
Ext4 Developers List <linux-ext4@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v6] e2fsck: Correct ext4 dates generated by old kernels.
Date: Fri, 29 Nov 2013 16:54:43 -0500 [thread overview]
Message-ID: <1385762083.20396.48.camel@chiang> (raw)
In-Reply-To: <1384463193.1957.27.camel@chiang>
Is this version good, or should I make some more improvements?
On Thu, 2013-11-14 at 16:06 -0500, David Turner wrote:
> Not sure what the official subject line format is for revising only
> one of N patches, so I'm trying this one. Let me now if it is wrong.
>
> On Thu, 2013-11-14 at 02:15 -0800, Mark Harris wrote:
> > > + * mis-encoded.
> > > + */
> > > +#define EXT4_EXTRA_NEGATIVE_DATE_CUTOFF 5 * (1ULL << 32)
> >
> > Wouldn't 2242 be 0x200000000ULL, i.e. 2 * (1ULL << 32)?
>
> Actually, it would be 2 * (1LL << 32), because we later use it in a
> comparison with a signed value.
>
> --
> Older kernels on 64-bit machines would incorrectly encode pre-1970
> ext4 dates as post-2311 dates. Detect and correct this (assuming the
> current date is before 2242).
>
> Signed-off-by: David Turner <novalis@novalis.org>
> ---
> e2fsck/pass1.c | 41 +++++++++++++++++++++++++++++++++++++++++
> e2fsck/problem.c | 4 ++++
> e2fsck/problem.h | 4 ++++
> 3 files changed, 49 insertions(+)
>
> diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
> index ab23e42..e19855f 100644
> --- a/e2fsck/pass1.c
> +++ b/e2fsck/pass1.c
> @@ -348,6 +348,24 @@ fix:
> EXT2_INODE_SIZE(sb), "pass1");
> }
>
> +#define EXT4_EPOCH_BITS 2
> +#define EXT4_EPOCH_MASK ((1 << EXT4_EPOCH_BITS) - 1)
> +
> +static int check_inode_extra_negative_epoch(__u32 xtime, __u32 extra) {
> + return (xtime & (1 << 31)) != 0 &&
> + (extra & EXT4_EPOCH_MASK) == EXT4_EPOCH_MASK;
> +}
> +
> +#define CHECK_INODE_EXTRA_NEGATIVE_EPOCH(inode, xtime) \
> + check_inode_extra_negative_epoch(inode->i_##xtime, \
> + inode->i_##xtime##_extra)
> +
> +/* When today's date is earlier than 2242, we assume that atimes,
> + * ctimes, and mtimes with years in the range 2310..2378 are actually
> + * pre-1970 dates mis-encoded.
> + */
> +#define EXT4_EXTRA_NEGATIVE_DATE_CUTOFF 2 * (1LL << 32)
> +
> static void check_inode_extra_space(e2fsck_t ctx, struct problem_context *pctx)
> {
> struct ext2_super_block *sb = ctx->fs->super;
> @@ -388,6 +406,29 @@ static void check_inode_extra_space(e2fsck_t ctx, struct problem_context *pctx)
> /* it seems inode has an extended attribute(s) in body */
> check_ea_in_inode(ctx, pctx);
> }
> +
> + /*
> + * If the inode's extended atime (ctime, mtime) is stored in
> + * the old, invalid format, repair it.
> + */
> + if (sizeof(time_t) > 4 && ctx->now < EXT4_EXTRA_NEGATIVE_DATE_CUTOFF &&
> + (CHECK_INODE_EXTRA_NEGATIVE_EPOCH(inode, atime) ||
> + CHECK_INODE_EXTRA_NEGATIVE_EPOCH(inode, ctime) ||
> + CHECK_INODE_EXTRA_NEGATIVE_EPOCH(inode, mtime))) {
> +
> + if (!fix_problem(ctx, PR_1_EA_TIME_OUT_OF_RANGE, pctx))
> + return;
> +
> + if (CHECK_INODE_EXTRA_NEGATIVE_EPOCH(inode, atime))
> + inode->i_atime_extra &= ~EXT4_EPOCH_MASK;
> + if (CHECK_INODE_EXTRA_NEGATIVE_EPOCH(inode, ctime))
> + inode->i_ctime_extra &= ~EXT4_EPOCH_MASK;
> + if (CHECK_INODE_EXTRA_NEGATIVE_EPOCH(inode, mtime))
> + inode->i_mtime_extra &= ~EXT4_EPOCH_MASK;
> + e2fsck_write_inode_full(ctx, pctx->ino, pctx->inode,
> + EXT2_INODE_SIZE(sb), "pass1");
> + }
> +
> }
>
> /*
> diff --git a/e2fsck/problem.c b/e2fsck/problem.c
> index 897693a..b212d00 100644
> --- a/e2fsck/problem.c
> +++ b/e2fsck/problem.c
> @@ -1018,6 +1018,10 @@ static struct e2fsck_problem problem_table[] = {
> N_("@i %i, end of extent exceeds allowed value\n\t(logical @b %c, physical @b %b, len %N)\n"),
> PROMPT_CLEAR, 0 },
>
> + /* Timestamp(s) on inode beyond 2310-04-04 are likely pre-1970 dates. */
> + { PR_1_EA_TIME_OUT_OF_RANGE,
> + N_("Timestamp(s) on @i %i beyond 2310-04-04 are likely pre-1970 dates.\n"),
> + PROMPT_FIX | PR_PREEN_OK | PR_NO_OK, 0 },
>
> /* Pass 1b errors */
>
> diff --git a/e2fsck/problem.h b/e2fsck/problem.h
> index ae1ed26..3710638 100644
> --- a/e2fsck/problem.h
> +++ b/e2fsck/problem.h
> @@ -593,6 +593,10 @@ struct problem_context {
> #define PR_1_EXTENT_INDEX_START_INVALID 0x01006D
>
> #define PR_1_EXTENT_END_OUT_OF_BOUNDS 0x01006E
> +
> +/* Timestamp(s) on inode beyond 2310-04-04 are likely pre-1970 dates. */
> +#define PR_1_EA_TIME_OUT_OF_RANGE 0x01006F
> +
> /*
> * Pass 1b errors
> */
next prev parent reply other threads:[~2013-11-29 21:54 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-07 7:16 [PATCH] ext4: Fix reading of extended tv_sec (bug 23732) David Turner
2013-11-07 16:03 ` Jan Kara
2013-11-07 22:54 ` [PATCH v2] " David Turner
2013-11-07 23:14 ` Jan Kara
2013-11-07 23:26 ` [PATCH v3] " David Turner
2013-11-08 5:17 ` Theodore Ts'o
2013-11-08 21:37 ` Andreas Dilger
2013-11-09 7:19 ` [PATCH] ext4: explain encoding of 34-bit a,c,mtime values David Turner
2013-11-09 23:51 ` Mark Harris
2013-11-10 7:56 ` David Turner
2013-11-12 0:30 ` Theodore Ts'o
2013-11-12 21:35 ` Andreas Dilger
2013-11-13 7:00 ` [PATCH v4 1/2] ext4: Fix handling of extended tv_sec (bug 23732) David Turner
2013-11-13 8:19 ` Darrick J. Wong
2013-11-13 7:00 ` [PATCH v4 2/2] e2fsck: Correct ext4 dates generated by old kernels David Turner
2013-11-13 7:56 ` Andreas Dilger
2013-11-14 8:38 ` [PATCH v5 1/2] ext4: Fix handling of extended tv_sec (bug 23732) David Turner
2013-11-14 8:44 ` [PATCH v5 2/2] e2fsck: Correct ext4 dates generated by old kernels David Turner
2013-11-14 10:15 ` Mark Harris
2013-11-14 21:06 ` [PATCH v6] " David Turner
2013-11-29 21:54 ` David Turner [this message]
2013-11-29 22:11 ` Andreas Dilger
2013-12-07 20:02 ` [PATCH v7 1/2] " David Turner
2013-12-07 22:33 ` Andreas Dilger
2013-12-08 0:53 ` Theodore Ts'o
2013-12-08 2:58 ` David Turner
2013-12-08 3:21 ` Theodore Ts'o
2013-12-07 20:02 ` [PATCH v7 2/2] debugfs: Decode {a,c,cr,m}time_extra fields in stat David Turner
2013-11-12 23:03 ` [PATCH] ext4: explain encoding of 34-bit a,c,mtime values Darrick J. Wong
2013-11-13 2:36 ` David Turner
2014-01-22 6:22 ` Darrick J. Wong
2014-02-11 5:12 ` David Turner
2014-02-11 7:07 ` Andreas Dilger
2014-02-14 3:47 ` [PATCH v8 1/2] ext4: Fix handling of extended tv_sec (bug 23732) David Turner
2014-02-14 3:47 ` [PATCH v8 2/2] e2fsck: Correct ext4 dates generated by old kernels David Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1385762083.20396.48.camel@chiang \
--to=novalis@novalis.org \
--cc=adilger@dilger.ca \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhlk@osj.us \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).