mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 07:15:17 +00:00
Code Issues Releases Wiki Activity

ofp-parse: Properly report error for invalid group ID.

Browse Source 
The inner 'error' shadowed an outer one, so that the error, when set, was
never returned to the caller.

Found by LLVM scan-build.

Reported-by: Kevin Lo <kevlo@FreeBSD.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
This commit is contained in:
Ben Pfaff
2015-04-16 13:56:46 -07:00
parent 9dd30b0571
commit aa6fb0772f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ofp-parse.c
View File

@@ -1356,7 +1356,7 @@ parse_ofp_group_mod_str__(struct ofputil_group_mod *gm, uint16_t command,
if(!strcmp(value, "all")) { if(!strcmp(value, "all")) {
gm->group_id = OFPG_ALL; gm->group_id = OFPG_ALL;
} else { } else {
char *error = str_to_u32(value, &gm->group_id); error = str_to_u32(value, &gm->group_id);
if (error) { if (error) {
goto out; goto out;
} }

5
tests/ofproto.at
View File

@@ -313,6 +313,11 @@ AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0], [0], [stdout])
AT_CHECK([STRIP_XIDS stdout], [0], [dnl AT_CHECK([STRIP_XIDS stdout], [0], [dnl
OFPST_GROUP_DESC reply (OF1.1): OFPST_GROUP_DESC reply (OF1.1):
]) ])
# Negative test.
AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=0xfffffff0],
[1], [], [ovs-ofctl: invalid group id 4294967280
])
OVS_VSWITCHD_STOP OVS_VSWITCHD_STOP
AT_CLEANUP AT_CLEANUP