From: Stephen Hemminger <stephen@networkplumber.org>
To: netdev@vger.kernel.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH iproute] bridge: catch invalid stp state
Date: Mon, 7 Oct 2024 09:35:43 -0700 [thread overview]
Message-ID: <20241007163654.499827-1-stephen@networkplumber.org> (raw)
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) {
Fixes: dae3e5de6eac ("bridge: mst: Add get/set support for MST states")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
bridge/mst.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/bridge/mst.c b/bridge/mst.c
index fccb7fd6..32f64aba 100644
--- a/bridge/mst.c
+++ b/bridge/mst.c
@@ -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);
--
2.45.2
next reply other threads:[~2024-10-07 16:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-07 16:35 Stephen Hemminger [this message]
2024-10-08 16:20 ` [PATCH iproute] bridge: catch invalid stp state patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241007163654.499827-1-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.