From: Phil Sutter <phil@nwl.cc>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: netdev@vger.kernel.org
Subject: [iproute PATCH v2 3/7] iplink_can: Prevent overstepping array bounds
Date: Thu, 17 Aug 2017 19:09:27 +0200 [thread overview]
Message-ID: <20170817170931.24302-4-phil@nwl.cc> (raw)
In-Reply-To: <20170817170931.24302-1-phil@nwl.cc>
can_state_names array contains at most CAN_STATE_MAX fields, so allowing
an index to it to be equal to that number is wrong. While here, also
make sure the array is indeed that big so nothing bad happens if
CAN_STATE_MAX ever increases.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
ip/iplink_can.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ip/iplink_can.c b/ip/iplink_can.c
index 5df56b2bbbb3b..2954010fefa22 100644
--- a/ip/iplink_can.c
+++ b/ip/iplink_can.c
@@ -251,7 +251,7 @@ static int can_parse_opt(struct link_util *lu, int argc, char **argv,
return 0;
}
-static const char *can_state_names[] = {
+static const char *can_state_names[CAN_STATE_MAX] = {
[CAN_STATE_ERROR_ACTIVE] = "ERROR-ACTIVE",
[CAN_STATE_ERROR_WARNING] = "ERROR-WARNING",
[CAN_STATE_ERROR_PASSIVE] = "ERROR-PASSIVE",
@@ -275,7 +275,7 @@ static void can_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_CAN_STATE]) {
uint32_t state = rta_getattr_u32(tb[IFLA_CAN_STATE]);
- fprintf(f, "state %s ", state <= CAN_STATE_MAX ?
+ fprintf(f, "state %s ", state < CAN_STATE_MAX ?
can_state_names[state] : "UNKNOWN");
}
--
2.13.1
next prev parent reply other threads:[~2017-08-17 17:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-17 17:09 [iproute PATCH v2 0/7] Covscan: Don't access garbage Phil Sutter
2017-08-17 17:09 ` [iproute PATCH v2 1/7] ipaddress: Make buffer for filter.flushb static Phil Sutter
2017-08-18 11:57 ` Phil Sutter
2017-08-18 15:55 ` Stephen Hemminger
2017-08-17 17:09 ` [iproute PATCH v2 2/7] ipaddress: Avoid accessing uninitialized variable lcl Phil Sutter
2017-08-17 17:09 ` Phil Sutter [this message]
2017-08-17 17:09 ` [iproute PATCH v2 4/7] ipmaddr: Avoid accessing uninitialized data Phil Sutter
2017-08-17 17:09 ` [iproute PATCH v2 5/7] ss: Use C99 initializer in netlink_show_one() Phil Sutter
2017-08-17 17:09 ` [iproute PATCH v2 6/7] netem/maketable: Check return value of fstat() Phil Sutter
2017-08-17 17:09 ` [iproute PATCH v2 7/7] tc/q_multiq: Don't pass garbage in TCA_OPTIONS Phil Sutter
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=20170817170931.24302-4-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).