korg/iproute2
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2024-11-14 13:33:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

bridge: catch invalid stp state

Browse Source 
The stp state parsing was putting result in an __u8 which
would mean that check for invalid string was never happening.

Caught by enabling -Wextra:
    CC       mst.o
mst.c: In function ‘mst_set’:
mst.c:217:27: warning: comparison is always false due to limited range of data type [-Wtype-limits]
  217 |                 if (state == -1) {

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2024-10-07 09:33:48 -07:00
parent b32ac38cc4
commit f4b86f752d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bridge/mst.c
View File

@ -176,7 +176,7 @@ static int mst_set(int argc, char **argv)
char *d = NULL, *m = NULL, *s = NULL, *endptr;
struct rtattr *af_spec, *mst, *entry;
__u16 msti;
__u8 state;
int state;
while (argc > 0) {
if (strcmp(*argv, "dev") == 0) {
@ -212,13 +212,12 @@ static int mst_set(int argc, char **argv)
}
state = strtol(s, &endptr, 10);
if (!(*s != '\0' && *endptr == '\0')) {
if (!(*s != '\0' && *endptr == '\0'))
state = parse_stp_state(s);
if (state == -1) {
fprintf(stderr,
"Error: invalid STP port state\n");
return -1;
}
if (state < 0 || state > UINT8_MAX) {
fprintf(stderr, "Error: invalid STP port state\n");
return -1;
}
af_spec = addattr_nest(&req.n, sizeof(req), IFLA_AF_SPEC);