Use a uint16_t variable to store a 16-bit value, not an int.

This is a style issue, not a bug, because the int only ever held
values in the range 0...UINT16_MAX.

Found by Chris Eagle via Fortify.

diff --git a/datapath/dp_act.c b/datapath/dp_act.c
index 3b5086f6344d85d362fb56fa3ea3a43b1650cb86..56104506077e851c802ae1f30bd5ea5815992e2f 100644 (file)
--- a/datapath/dp_act.c
+++ b/datapath/dp_act.c
@@ -311,7 +311,7 @@ static uint16_t
 validate_ofpat(struct datapath *dp, const struct sw_flow_key *key, 
                const struct ofp_action_header *ah, uint16_t type, uint16_t len)
 {
-       int ret = ACT_VALIDATION_OK;
+       uint16_t ret = ACT_VALIDATION_OK;
        const struct openflow_action *act = &of_actions[type];
 
        if ((len < act->min_size) || (len > act->max_size)) 

diff --git a/udatapath/dp_act.c b/udatapath/dp_act.c
index fc800f005193d66703cc421aff7057981b01a6f0..8579b10a7e5d5c2b41dfe3090ae68443acc9e22c 100644 (file)
--- a/udatapath/dp_act.c
+++ b/udatapath/dp_act.c
@@ -300,7 +300,7 @@ static uint16_t
 validate_ofpat(struct datapath *dp, const struct sw_flow_key *key, 
         const struct ofp_action_header *ah, uint16_t type, uint16_t len)
 {
-    int ret = ACT_VALIDATION_OK;
+    uint16_t ret = ACT_VALIDATION_OK;
     const struct openflow_action *act = &of_actions[type];
 
     if ((len < act->min_size) || (len > act->max_size)) {