From 699ee25b95517c6cf2190f92f1c00a7d069b85c9 Mon Sep 17 00:00:00 2001 From: asomers Date: Fri, 7 Jul 2017 15:22:29 +0000 Subject: [PATCH] MFC r319337: Fix integer overflow in "camcontrol format" Reported by: Coverity CID: 1011426 Sponsored by: Spectra Logic Corp git-svn-id: svn://svn.freebsd.org/base/stable/10@320781 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sbin/camcontrol/camcontrol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 37a7eb2f0..9cf81407e 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -6044,15 +6044,15 @@ scsiformat(struct cam_device *device, int argc, char **argv, if ((scsi_get_sks(sense, ccb->csio.sense_len - ccb->csio.sense_resid, sks) == 0) && (quiet == 0)) { - int val; + uint32_t val; u_int64_t percentage; val = scsi_2btoul(&sks[1]); - percentage = 10000 * val; + percentage = 10000ull * val; fprintf(stdout, "\rFormatting: %ju.%02u %% " - "(%d/%d) done", + "(%u/%d) done", (uintmax_t)(percentage / (0x10000 * 100)), (unsigned)((percentage / -- 2.45.0