Author: pfg
Date: Wed Apr 27 15:10:40 2016
New Revision: 298698
URL: https://svnweb.freebsd.org/changeset/base/298698
Log:
geom: unsign some types to match their definitions and avoid overflows.
In struct:gctl_req, nargs is unsigned.
In mirror:
g_mirror_syncreqs is unsigned.
In raid:
in struct:g_raid_volume, v_disks_count is unsigned.
In virstor:
in struct:g_virstor_softc, n_components is unsigned.
MFC after: 2 weeks
Modified:
head/sys/geom/geom_ctl.c
head/sys/geom/mirror/g_mirror.c
head/sys/geom/raid/md_promise.c
head/sys/geom/raid/md_sii.c
head/sys/geom/virstor/g_virstor.c
Modified: head/sys/geom/geom_ctl.c
==============================================================================
--- head/sys/geom/geom_ctl.c Wed Apr 27 13:10:43 2016 (r298697)
+++ head/sys/geom/geom_ctl.c Wed Apr 27 15:10:40 2016 (r298698)
@@ -135,7 +135,7 @@ gctl_copyin(struct gctl_req *req)
{
struct gctl_req_arg *ap;
char *p;
- int i;
+ u_int i;
ap = geom_alloc_copyin(req, req->arg, req->narg * sizeof(*ap));
if (ap == NULL) {
@@ -212,7 +212,7 @@ gctl_copyout(struct gctl_req *req)
static void
gctl_free(struct gctl_req *req)
{
- int i;
+ u_int i;
sbuf_delete(req->serror);
if (req->arg == NULL)
@@ -270,7 +270,7 @@ int
gctl_set_param(struct gctl_req *req, const char *param, void const *ptr,
int len)
{
- int i;
+ u_int i;
struct gctl_req_arg *ap;
for (i = 0; i < req->narg; i++) {
@@ -311,7 +311,7 @@ gctl_set_param_err(struct gctl_req *req,
void *
gctl_get_param(struct gctl_req *req, const char *param, int *len)
{
- int i;
+ u_int i;
void *p;
struct gctl_req_arg *ap;
@@ -332,7 +332,7 @@ gctl_get_param(struct gctl_req *req, con
char const *
gctl_get_asciiparam(struct gctl_req *req, const char *param)
{
- int i;
+ u_int i;
char const *p;
struct gctl_req_arg *ap;
Modified: head/sys/geom/mirror/g_mirror.c
==============================================================================
--- head/sys/geom/mirror/g_mirror.c Wed Apr 27 13:10:43 2016
(r298697)
+++ head/sys/geom/mirror/g_mirror.c Wed Apr 27 15:10:40 2016
(r298698)
@@ -1160,7 +1160,7 @@ g_mirror_sync_collision(struct g_mirror_
struct g_mirror_disk *disk;
struct bio *sbp;
off_t rstart, rend, sstart, send;
- int i;
+ u_int i;
if (sc->sc_sync.ds_ndisks == 0)
return (0);
Modified: head/sys/geom/raid/md_promise.c
==============================================================================
--- head/sys/geom/raid/md_promise.c Wed Apr 27 13:10:43 2016
(r298697)
+++ head/sys/geom/raid/md_promise.c Wed Apr 27 15:10:40 2016
(r298698)
@@ -893,7 +893,7 @@ g_raid_md_promise_start(struct g_raid_vo
struct g_raid_md_promise_perdisk *pd;
struct g_raid_md_promise_pervolume *pv;
struct promise_raid_conf *meta;
- int i;
+ u_int i;
sc = vol->v_softc;
md = sc->sc_md;
Modified: head/sys/geom/raid/md_sii.c
==============================================================================
--- head/sys/geom/raid/md_sii.c Wed Apr 27 13:10:43 2016 (r298697)
+++ head/sys/geom/raid/md_sii.c Wed Apr 27 15:10:40 2016 (r298698)
@@ -1482,7 +1482,7 @@ g_raid_md_write_sii(struct g_raid_md_obj
struct g_raid_md_sii_object *mdi;
struct g_raid_md_sii_perdisk *pd;
struct sii_raid_conf *meta;
- int i;
+ u_int i;
sc = md->mdo_softc;
mdi = (struct g_raid_md_sii_object *)md;
Modified: head/sys/geom/virstor/g_virstor.c
==============================================================================
--- head/sys/geom/virstor/g_virstor.c Wed Apr 27 13:10:43 2016
(r298697)
+++ head/sys/geom/virstor/g_virstor.c Wed Apr 27 15:10:40 2016
(r298698)
@@ -471,7 +471,7 @@ static void
update_metadata(struct g_virstor_softc *sc)
{
struct g_virstor_metadata md;
- int n;
+ u_int n;
if (virstor_valid_components(sc) != sc->n_components)
return; /* Incomplete device */
@@ -928,7 +928,7 @@ virstor_geom_destroy(struct g_virstor_so
{
struct g_provider *pp;
struct g_geom *gp;
- int n;
+ u_int n;
g_topology_assert();
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
