Merge tag 'y2038-vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground

Pull y2038 vfs updates from Arnd Bergmann:
 "Add inode timestamp clamping.

  This series from Deepa Dinamani adds a per-superblock minimum/maximum
  timestamp limit for a file system, and clamps timestamps as they are
  written, to avoid random behavior from integer overflow as well as
  having different time stamps on disk vs in memory.

  At mount time, a warning is now printed for any file system that can
  represent current timestamps but not future timestamps more than 30
  years into the future, similar to the arbitrary 30 year limit that was
  added to settimeofday().

  This was picked as a compromise to warn users to migrate to other file
  systems (e.g. ext4 instead of ext3) when they need the file system to
  survive beyond 2038 (or similar limits in other file systems), but not
  get in the way of normal usage"

* tag 'y2038-vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground:
  ext4: Reduce ext4 timestamp warnings
  isofs: Initialize filesystem timestamp ranges
  pstore: fs superblock limits
  fs: omfs: Initialize filesystem timestamp ranges
  fs: hpfs: Initialize filesystem timestamp ranges
  fs: ceph: Initialize filesystem timestamp ranges
  fs: sysv: Initialize filesystem timestamp ranges
  fs: affs: Initialize filesystem timestamp ranges
  fs: fat: Initialize filesystem timestamp ranges
  fs: cifs: Initialize filesystem timestamp ranges
  fs: nfs: Initialize filesystem timestamp ranges
  ext4: Initialize timestamps limits
  9p: Fill min and max timestamps in sb
  fs: Fill in max and min timestamps in superblock
  utimes: Clamp the timestamps before update
  mount: Add mount warning for impending timestamp expiry
  timestamp_truncate: Replace users of timespec64_trunc
  vfs: Add timestamp_truncate() api
  vfs: Add file timestamp range support

2 files changed, 29 insertions, 7 deletions

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 4e2f74894e9b..e8afff702bb8 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -56,6 +56,15 @@
 #include "dfs_cache.h"
 #endif
 
+/*
+ * DOS dates from 1980/1/1 through 2107/12/31
+ * Protocol specifications indicate the range should be to 119, which
+ * limits maximum year to 2099. But this range has not been checked.
+ */
+#define SMB_DATE_MAX (127<<9 | 12<<5 | 31)
+#define SMB_DATE_MIN (0<<9 | 1<<5 | 1)
+#define SMB_TIME_MAX (23<<11 | 59<<5 | 29)
+
 int cifsFYI = 0;
 bool traceSMB;
 bool enable_oplocks = true;
@@ -142,6 +151,7 @@ cifs_read_super(struct super_block *sb)
         struct inode *inode;
         struct cifs_sb_info *cifs_sb;
         struct cifs_tcon *tcon;
+        struct timespec64 ts;
         int rc = 0;
 
         cifs_sb = CIFS_SB(sb);
@@ -161,6 +171,18 @@ cifs_read_super(struct super_block *sb)
         /* BB FIXME fix time_gran to be larger for LANMAN sessions */
         sb->s_time_gran = 100;
 
+        if (tcon->unix_ext) {
+                ts = cifs_NTtimeToUnix(0);
+                sb->s_time_min = ts.tv_sec;
+                ts = cifs_NTtimeToUnix(cpu_to_le64(S64_MAX));
+                sb->s_time_max = ts.tv_sec;
+        } else {
+                ts = cnvrtDosUnixTm(cpu_to_le16(SMB_DATE_MIN), 0, 0);
+                sb->s_time_min = ts.tv_sec;
+                ts = cnvrtDosUnixTm(cpu_to_le16(SMB_DATE_MAX), cpu_to_le16(SMB_TIME_MAX), 0);
+                sb->s_time_max = ts.tv_sec;
+        }
+
         sb->s_magic = CIFS_MAGIC_NUMBER;
         sb->s_op = &cifs_super_ops;
         sb->s_xattr = cifs_xattr_handlers;
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index ed92958e842d..49c17ee18254 100644
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -949,8 +949,8 @@ static const int total_days_of_prev_months[] = {
 struct timespec64 cnvrtDosUnixTm(__le16 le_date, __le16 le_time, int offset)
 {
         struct timespec64 ts;
-        time64_t sec;
-        int min, days, month, year;
+        time64_t sec, days;
+        int min, day, month, year;
         u16 date = le16_to_cpu(le_date);
         u16 time = le16_to_cpu(le_time);
         SMB_TIME *st = (SMB_TIME *)&time;
@@ -966,15 +966,15 @@ struct timespec64 cnvrtDosUnixTm(__le16 le_date, __le16 le_time, int offset)
         sec += 60 * 60 * st->Hours;
         if (st->Hours > 24)
                 cifs_dbg(VFS, "illegal hours %d\n", st->Hours);
-        days = sd->Day;
+        day = sd->Day;
         month = sd->Month;
-        if (days < 1 || days > 31 || month < 1 || month > 12) {
-                cifs_dbg(VFS, "illegal date, month %d day: %d\n", month, days);
-                days = clamp(days, 1, 31);
+        if (day < 1 || day > 31 || month < 1 || month > 12) {
+                cifs_dbg(VFS, "illegal date, month %d day: %d\n", month, day);
+                day = clamp(day, 1, 31);
                 month = clamp(month, 1, 12);
         }
         month -= 1;
-        days += total_days_of_prev_months[month];
+        days = day + total_days_of_prev_months[month];
         days += 3652; /* account for difference in days between 1980 and 1970 */
         year = sd->Year;
         days += year * 365;