From 67a70eac6d81ee5a7473e11cae464c89783af725 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 1 May 2017 21:43:43 +0300 Subject: [PATCH] cifs: small underflow in cnvrtDosUnixTm() commit 564277eceeca01e02b1ef3e141cfb939184601b4 upstream. January is month 1. There is no zero-th month. If someone passes a zero month then it means we read from one space before the start of the total_days_of_prev_months[] array. We may as well also be strict about days as well. Fixes: 1bd5bbcb6531 ("[CIFS] Legacy time handling for Win9x and OS/2 part 1") Signed-off-by: Dan Carpenter Signed-off-by: Steve French [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings --- fs/cifs/netmisc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c index 73e47e84b61a4..3732f79bc067a 100644 --- a/fs/cifs/netmisc.c +++ b/fs/cifs/netmisc.c @@ -974,10 +974,10 @@ struct timespec cnvrtDosUnixTm(__le16 le_date, __le16 le_time, int offset) cERROR(1, "illegal hours %d", st->Hours); days = sd->Day; month = sd->Month; - if ((days > 31) || (month > 12)) { + if (days < 1 || days > 31 || month < 1 || month > 12) { cERROR(1, "illegal date, month %d day: %d", month, days); - if (month > 12) - month = 12; + days = clamp(days, 1, 31); + month = clamp(month, 1, 12); } month -= 1; days += total_days_of_prev_months[month]; -- 2.47.3