d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cam: unsign some types to match their definitions and avoid overflows.

Browse Source 
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
This commit is contained in:
Pedro F. Giffuni 2016-04-27 15:35:05 +00:00
parent 9a5be809ab
commit 167e63e394
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/cam/cam_xpt.c
View File

@ -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.

14
sys/cam/ctl/ctl.c
View File

@ -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