linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/2] isofs: fix timestamps beyond 2027
@ 2017-10-19 14:47 Arnd Bergmann
  2017-10-19 14:47 ` [PATCH v2 2/2] isofs: use unsigned char types consistently Arnd Bergmann
  2017-10-19 15:17 ` [PATCH v2 1/2] isofs: fix timestamps beyond 2027 Jan Kara
  0 siblings, 2 replies; 7+ messages in thread
From: Arnd Bergmann @ 2017-10-19 14:47 UTC (permalink / raw)
  To: y2038, Jan Kara
  Cc: Al Viro, Deepa Dinamani, linux-fsdevel, Anders Larsen,
	Arnd Bergmann, stable, David Howells, linux-kernel

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>
---
v2: change function prototype instead of adding a cast
---
 fs/isofs/isofs.h | 2 +-
 fs/isofs/rock.h  | 2 +-
 fs/isofs/util.c  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h
index 133a456b0425..bd4047585431 100644
--- 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 ed09e2b08637..f835976ce033 100644
--- 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 005a15cfd30a..335f62db0b53 100644
--- a/fs/isofs/util.c
+++ b/fs/isofs/util.c
@@ -15,12 +15,12 @@
  * 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;
 
-	year = p[0];
+	year = (int)(u8)p[0];
 	month = p[1];
 	day = p[2];
 	hour = p[3];
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2017-10-31 21:36 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-19 14:47 [PATCH v2 1/2] isofs: fix timestamps beyond 2027 Arnd Bergmann
2017-10-19 14:47 ` [PATCH v2 2/2] isofs: use unsigned char types consistently Arnd Bergmann
2017-10-31 17:11   ` Jan Kara
2017-10-19 15:17 ` [PATCH v2 1/2] isofs: fix timestamps beyond 2027 Jan Kara
2017-10-19 15:29   ` Arnd Bergmann
2017-10-31 16:59     ` Jan Kara
2017-10-31 21:36       ` Arnd Bergmann

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).