scsi: sg: Avoid overflow when USER_HZ > HZ

[linux.git] / drivers / scsi / sg.c

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index ae7d9bdf409c816d014ac2d668a1e449fce0c8e9..bb5ec2d6abdf53ae5b6bd77743a03513b93317f6 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -884,8 +884,9 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
                        return result;
                if (val < 0)
                        return -EIO;
-               if (val >= MULDIV (INT_MAX, USER_HZ, HZ))
-                   val = MULDIV (INT_MAX, USER_HZ, HZ);
+               if (val >= MULDIV((s64)INT_MAX, USER_HZ, HZ))
+                       val = min_t(s64, MULDIV((s64)INT_MAX, USER_HZ, HZ),
+                                   INT_MAX);
                sfp->timeout_user = val;
                sfp->timeout = MULDIV (val, HZ, USER_HZ);