[CIFS] Fix minor problems noticed by scan

Coverity scan pointed out some minor possible errors.

Signed-off-by: Steve French <sfrench@us.ibm.com>

2 files changed, 10 insertions, 7 deletions

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index abca6b084ed1..91ba32861c88 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -308,15 +308,15 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
                                         seq_printf(s, ",domain=%s",
                                            cifs_sb->tcon->ses->domainName);
                         }
+                        if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID) ||
+                           !(cifs_sb->tcon->unix_ext))
+                                seq_printf(s, ",uid=%d", cifs_sb->mnt_uid);
+                        if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID) ||
+                           !(cifs_sb->tcon->unix_ext))
+                                seq_printf(s, ",gid=%d", cifs_sb->mnt_gid);
                 }
                 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)
                         seq_printf(s, ",posixpaths");
-                if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID) ||
-                   !(cifs_sb->tcon->unix_ext))
-                        seq_printf(s, ",uid=%d", cifs_sb->mnt_uid);
-                if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID) ||
-                   !(cifs_sb->tcon->unix_ext))
-                        seq_printf(s, ",gid=%d", cifs_sb->mnt_gid);
                 seq_printf(s, ",rsize=%d", cifs_sb->rsize);
                 seq_printf(s, ",wsize=%d", cifs_sb->wsize);
         }
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index 2bfed3f45d0f..9ae4941cd61d 100644
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -899,8 +899,11 @@ struct timespec cnvrtDosUnixTm(__u16 date, __u16 time)
                 cERROR(1, ("illegal hours %d", st->Hours));
         days = sd->Day;
         month = sd->Month;
-        if ((days > 31) || (month > 12))
+        if ((days > 31) || (month > 12)) {
                 cERROR(1, ("illegal date, month %d day: %d", month, days));
+                if (month > 12)
+                        month = 12;
+        }
         month -= 1;
         days += total_days_of_prev_months[month];
         days += 3652; /* account for difference in days between 1980 and 1970 */