matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #14216 from LabNConsulting/ziemba-coverity-pbr-230816

Browse source 
pbrd: address coverity issues reported 230815
This commit is contained in:
Donald Sharp 2023-08-19 16:17:14 -04:00 committed by GitHub
parent fa8e49c79e 5cde1e89f0
commit 899427b515
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pbrd/pbr_vty.c
View file

@ -441,18 +441,18 @@ DEFPY (pbr_map_match_dscp,
} }
unsigned long ul_dscp; unsigned long ul_dscp;
char *pend; char *pend = NULL;
uint8_t raw_dscp; uint8_t raw_dscp;
assert(dscp); assert(dscp);
ul_dscp = strtol(dscp, &pend, 0); ul_dscp = strtoul(dscp, &pend, 0);
if (*pend) if (pend && *pend)
raw_dscp = pbr_map_decode_dscp_enum(dscp); raw_dscp = pbr_map_decode_dscp_enum(dscp);
else else
raw_dscp = ul_dscp << 2; raw_dscp = ul_dscp << 2;
if (raw_dscp > PBR_DSFIELD_DSCP) { if (raw_dscp > PBR_DSFIELD_DSCP) {
vty_out(vty, "Invalid dscp value: %s%s\n", dscp, vty_out(vty, "Invalid dscp value: %s%s\n", dscp,
(pend ? "" : " (numeric value must be in range 0-63)")); ((pend && *pend) ? "" : " (numeric value must be in range 0-63)"));
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
@ -790,6 +790,9 @@ DEFPY (pbr_map_action_src_port,
/* clang-format on */ /* clang-format on */
struct pbr_map_sequence *pbrms = VTY_GET_CONTEXT(pbr_map_sequence); struct pbr_map_sequence *pbrms = VTY_GET_CONTEXT(pbr_map_sequence);
if (!pbrms)
return CMD_WARNING_CONFIG_FAILED;
if (no) { if (no) {
if (!CHECK_FLAG(pbrms->action_bm, PBR_ACTION_SRC_PORT)) if (!CHECK_FLAG(pbrms->action_bm, PBR_ACTION_SRC_PORT))
return CMD_SUCCESS; return CMD_SUCCESS;
@ -821,6 +824,9 @@ DEFPY (pbr_map_action_dst_port,
/* clang-format on */ /* clang-format on */
struct pbr_map_sequence *pbrms = VTY_GET_CONTEXT(pbr_map_sequence); struct pbr_map_sequence *pbrms = VTY_GET_CONTEXT(pbr_map_sequence);
if (!pbrms)
return CMD_WARNING_CONFIG_FAILED;
if (no) { if (no) {
if (!CHECK_FLAG(pbrms->action_bm, PBR_ACTION_DST_PORT)) if (!CHECK_FLAG(pbrms->action_bm, PBR_ACTION_DST_PORT))
return CMD_SUCCESS; return CMD_SUCCESS;
@ -851,6 +857,9 @@ DEFPY (pbr_map_action_dscp,
/* clang-format on */ /* clang-format on */
struct pbr_map_sequence *pbrms = VTY_GET_CONTEXT(pbr_map_sequence); struct pbr_map_sequence *pbrms = VTY_GET_CONTEXT(pbr_map_sequence);
if (!pbrms)
return CMD_WARNING_CONFIG_FAILED;
if (no) { if (no) {
if (!CHECK_FLAG(pbrms->action_bm, PBR_ACTION_DSCP)) if (!CHECK_FLAG(pbrms->action_bm, PBR_ACTION_DSCP))
return CMD_SUCCESS; return CMD_SUCCESS;
@ -859,19 +868,19 @@ DEFPY (pbr_map_action_dscp,
} }
unsigned long ul_dscp; unsigned long ul_dscp;
char *pend; char *pend = NULL;
uint8_t raw_dscp; uint8_t raw_dscp;
assert(dscp); assert(dscp);
ul_dscp = strtol(dscp, &pend, 0); ul_dscp = strtoul(dscp, &pend, 0);
if (*pend) if (pend && *pend)
raw_dscp = pbr_map_decode_dscp_enum(dscp); raw_dscp = pbr_map_decode_dscp_enum(dscp);
else else
raw_dscp = ul_dscp << 2; raw_dscp = ul_dscp << 2;
if (raw_dscp > PBR_DSFIELD_DSCP) { if (raw_dscp > PBR_DSFIELD_DSCP) {
vty_out(vty, "Invalid dscp value: %s%s\n", dscp, vty_out(vty, "Invalid dscp value: %s%s\n", dscp,
(pend ? "" : " (numeric value must be in range 0-63)")); ((pend && *pend) ? "" : " (numeric value must be in range 0-63)"));
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
if (CHECK_FLAG(pbrms->action_bm, PBR_ACTION_DSCP) && if (CHECK_FLAG(pbrms->action_bm, PBR_ACTION_DSCP) &&
@ -898,6 +907,9 @@ DEFPY (pbr_map_action_ecn,
/* clang-format on */ /* clang-format on */
struct pbr_map_sequence *pbrms = VTY_GET_CONTEXT(pbr_map_sequence); struct pbr_map_sequence *pbrms = VTY_GET_CONTEXT(pbr_map_sequence);
if (!pbrms)
return CMD_WARNING_CONFIG_FAILED;
if (no) { if (no) {
if (!CHECK_FLAG(pbrms->action_bm, PBR_ACTION_ECN)) if (!CHECK_FLAG(pbrms->action_bm, PBR_ACTION_ECN))
return CMD_SUCCESS; return CMD_SUCCESS;
@ -1342,6 +1354,7 @@ DEFPY(pbr_map_vrf, pbr_map_vrf_cmd,
* If an equivalent set vrf * exists, just return success. * If an equivalent set vrf * exists, just return success.
*/ */
if ((pbrms->forwarding_type == PBR_FT_SETVRF) && if ((pbrms->forwarding_type == PBR_FT_SETVRF) &&
vrf_name &&
strncmp(pbrms->vrf_name, vrf_name, sizeof(pbrms->vrf_name)) == 0) strncmp(pbrms->vrf_name, vrf_name, sizeof(pbrms->vrf_name)) == 0)
return CMD_SUCCESS; return CMD_SUCCESS;
else if (!vrf_name && (pbrms->forwarding_type == PBR_FT_VRF_UNCHANGED)) else if (!vrf_name && (pbrms->forwarding_type == PBR_FT_VRF_UNCHANGED))

9
pbrd/pbr_zebra.c
View file

@ -568,15 +568,10 @@ static bool pbr_encode_pbr_map_sequence(struct stream *s,
/* actions */ /* actions */
SET_FLAG(r.action.flags, PBR_ACTION_TABLE); /* always valid */
/*
* PBR should maintain its own set of action flags that we
* can copy here instead of trying to infer from magic values.
*/
r.action.flags = pbrms->action_bm; r.action.flags = pbrms->action_bm;
SET_FLAG(r.action.flags, PBR_ACTION_TABLE); /* always valid */
/* /*
* if the user does not use the command "set vrf name unchanged" * if the user does not use the command "set vrf name unchanged"
* then pbr_encode_pbr_map_sequence_vrf will not be called * then pbr_encode_pbr_map_sequence_vrf will not be called