diff options
author | Tina Ruchandani <ruchandani.tina@gmail.com> | 2015-10-30 05:11:10 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2015-11-11 20:45:23 -0500 |
commit | 36f8ef7f7684997f1c1efcc775b1d7cdf452ce44 (patch) | |
tree | ef5b0befbf45fc9d46c4a6f561697161d6515d92 | |
parent | dd29dae00d39186890a5eaa2fe4ad8768bfd41a9 (diff) |
mvumi: 64bit value for seconds_since1970
struct mvumi_hs_page2 stores a "seconds_since1970" field which is of
type u64. It is however, written to, using 'struct timeval' which has
a 32-bit seconds field and whose value will overflow in year 2038.
This patch uses ktime_get_real_seconds() instead since it provides a
64-bit seconds value, which is 2038 safe.
Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/scsi/mvumi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c index 3e6b866759fe..02360de6b7e0 100644 --- a/drivers/scsi/mvumi.c +++ b/drivers/scsi/mvumi.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/spinlock.h> | 31 | #include <linux/spinlock.h> |
32 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
33 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
34 | #include <linux/ktime.h> | ||
34 | #include <linux/blkdev.h> | 35 | #include <linux/blkdev.h> |
35 | #include <linux/io.h> | 36 | #include <linux/io.h> |
36 | #include <scsi/scsi.h> | 37 | #include <scsi/scsi.h> |
@@ -858,8 +859,8 @@ static void mvumi_hs_build_page(struct mvumi_hba *mhba, | |||
858 | struct mvumi_hs_page2 *hs_page2; | 859 | struct mvumi_hs_page2 *hs_page2; |
859 | struct mvumi_hs_page4 *hs_page4; | 860 | struct mvumi_hs_page4 *hs_page4; |
860 | struct mvumi_hs_page3 *hs_page3; | 861 | struct mvumi_hs_page3 *hs_page3; |
861 | struct timeval time; | 862 | u64 time; |
862 | unsigned int local_time; | 863 | u64 local_time; |
863 | 864 | ||
864 | switch (hs_header->page_code) { | 865 | switch (hs_header->page_code) { |
865 | case HS_PAGE_HOST_INFO: | 866 | case HS_PAGE_HOST_INFO: |
@@ -877,9 +878,8 @@ static void mvumi_hs_build_page(struct mvumi_hba *mhba, | |||
877 | hs_page2->slot_number = 0; | 878 | hs_page2->slot_number = 0; |
878 | hs_page2->intr_level = 0; | 879 | hs_page2->intr_level = 0; |
879 | hs_page2->intr_vector = 0; | 880 | hs_page2->intr_vector = 0; |
880 | do_gettimeofday(&time); | 881 | time = ktime_get_real_seconds(); |
881 | local_time = (unsigned int) (time.tv_sec - | 882 | local_time = (time - (sys_tz.tz_minuteswest * 60)); |
882 | (sys_tz.tz_minuteswest * 60)); | ||
883 | hs_page2->seconds_since1970 = local_time; | 883 | hs_page2->seconds_since1970 = local_time; |
884 | hs_header->checksum = mvumi_calculate_checksum(hs_header, | 884 | hs_header->checksum = mvumi_calculate_checksum(hs_header, |
885 | hs_header->frame_length); | 885 | hs_header->frame_length); |