diff options
author | pfg <pfg@FreeBSD.org> | 2016-04-27 15:35:05 +0000 |
---|---|---|
committer | pfg <pfg@FreeBSD.org> | 2016-04-27 15:35:05 +0000 |
commit | fe28ec8024a7da09961b3b7d4dc1e205b1b35bb1 (patch) | |
tree | 8c9170ca44b9e7bcaed966b26ad6dd55f91a15c8 /sys/cam | |
parent | 30f8ed214099a4949fb1161f8c38df10b35310cb (diff) | |
download | FreeBSD-src-fe28ec8024a7da09961b3b7d4dc1e205b1b35bb1.zip FreeBSD-src-fe28ec8024a7da09961b3b7d4dc1e205b1b35bb1.tar.gz |
cam: unsign some types to match their definitions and avoid overflows.
numpatterns is u_int.
ctl:
CTL_NUM_MODE_PAGES comes from sizeof().
In struct:ctl_scsiio, kern_sg_entries is uint32_t.
MFC after: 2 weeks
Diffstat (limited to 'sys/cam')
-rw-r--r-- | sys/cam/cam_xpt.c | 6 | ||||
-rw-r--r-- | sys/cam/ctl/ctl.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index b426857..d22eda2 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -1182,7 +1182,7 @@ xptbusmatch(struct dev_match_pattern *patterns, u_int num_patterns, struct cam_eb *bus) { dev_match_ret retval; - int i; + u_int i; retval = DM_RET_NONE; @@ -1294,7 +1294,7 @@ xptdevicematch(struct dev_match_pattern *patterns, u_int num_patterns, struct cam_ed *device) { dev_match_ret retval; - int i; + u_int i; retval = DM_RET_NONE; @@ -1417,7 +1417,7 @@ xptperiphmatch(struct dev_match_pattern *patterns, u_int num_patterns, struct cam_periph *periph) { dev_match_ret retval; - int i; + u_int i; /* * If we aren't given something to match against, that's an error. diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index bc94d43..d6331b9 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -916,7 +916,7 @@ ctl_isc_announce_mode(struct ctl_lun *lun, uint32_t initidx, { struct ctl_softc *softc = lun->ctl_softc; union ctl_ha_msg msg; - int i; + u_int i; if (softc->ha_link != CTL_HA_LINK_ONLINE) return; @@ -1284,7 +1284,7 @@ static void ctl_isc_mode_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) { struct ctl_lun *lun; - int i; + u_int i; uint32_t initidx, targ_lun; targ_lun = msg->hdr.nexus.targ_mapped_lun; @@ -6405,7 +6405,7 @@ ctl_mode_sense(struct ctl_scsiio *ctsio) */ switch (page_code) { case SMS_ALL_PAGES_PAGE: { - int i; + u_int i; page_len = 0; @@ -6457,7 +6457,7 @@ ctl_mode_sense(struct ctl_scsiio *ctsio) break; } default: { - int i; + u_int i; page_len = 0; @@ -12775,7 +12775,7 @@ static void ctl_datamove_remote_write_cb(struct ctl_ha_dt_req *rq) { union ctl_io *io; - int i; + uint32_t i; io = rq->context; @@ -12853,7 +12853,7 @@ ctl_datamove_remote_dm_read_cb(union ctl_io *io) char path_str[64]; struct sbuf sb; #endif - int i; + uint32_t i; for (i = 0; i < io->scsiio.kern_sg_entries; i++) free(io->io_hdr.local_sglist[i].addr, M_CTL); @@ -13094,7 +13094,7 @@ static void ctl_datamove_remote_read(union ctl_io *io) { int retval; - int i; + uint32_t i; /* * This will send an error to the other controller in the case of a |