isofs: fix timestamps beyond 2027

isofs uses a 'char' variable to load the number of years since
1900 for an inode timestamp. On architectures that use a signed
char type by default, this results in an invalid date for
anything beyond 2027.

This changes the function argument to a 'u8' array, which
is defined the same way on all architectures, and unambiguously
lets us use years until 2155.

This should be backported to all kernels that might still be
in use by that date.

Cc: stable@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h
index 133a456b04259bd84262723ce0d0ba27f85830d2..bd4047585431634efbf40d0ba1b677d015666472 100644 (file)
--- a/fs/isofs/isofs.h
+++ b/fs/isofs/isofs.h
@@ -106,7 +106,7 @@ static inline unsigned int isonum_733(char *p)
        /* Ignore bigendian datum due to broken mastering programs */
        return get_unaligned_le32(p);
 }
-extern int iso_date(char *, int);
+extern int iso_date(u8 *, int);
 
 struct inode;          /* To make gcc happy */
 

diff --git a/fs/isofs/rock.h b/fs/isofs/rock.h
index ed09e2b086372f0954200e487814e8e12e315542..f835976ce03339ac72939565c94c90cd9d9c9b12 100644 (file)
--- a/fs/isofs/rock.h
+++ b/fs/isofs/rock.h
@@ -65,7 +65,7 @@ struct RR_PL_s {
 };
 
 struct stamp {
-       char time[7];
+       __u8 time[7];           /* actually 6 unsigned, 1 signed */
 } __attribute__ ((packed));
 
 struct RR_TF_s {

diff --git a/fs/isofs/util.c b/fs/isofs/util.c
index 005a15cfd30a84d1e68021f5781e4a1d333d1a22..37860fea364d5b95723f36a6435399e1efb628b4 100644 (file)
--- a/fs/isofs/util.c
+++ b/fs/isofs/util.c
@@ -15,7 +15,7 @@
  * to GMT.  Thus  we should always be correct.
  */
 
-int iso_date(char * p, int flag)
+int iso_date(u8 *p, int flag)
 {
        int year, month, day, hour, minute, second, tz;
        int crtime;