From: Stephen Hemminger <stephen@networkplumber.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Stephen Hemminger <sthemmin@microsoft.com>
Subject: [PATCH net-next 1/9] dcb: enforce minimum length on IEEE_APPS attribute
Date: Fri, 19 May 2017 09:55:48 -0700 [thread overview]
Message-ID: <20170519165556.483-2-sthemmin@microsoft.com> (raw)
In-Reply-To: <20170519165556.483-1-sthemmin@microsoft.com>
Found by reviewing the warning about unused policy table.
The code implies that it meant to check for size, but since
it unrolled the loop for attribute validation that is never used.
Instead do explicit check for attribute.
Compile tested only. Needs review by original author.
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
net/dcb/dcbnl.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index 93106120f987..733f523707ac 100644
--- a/net/dcb/dcbnl.c
+++ b/net/dcb/dcbnl.c
@@ -178,10 +178,6 @@ static const struct nla_policy dcbnl_ieee_policy[DCB_ATTR_IEEE_MAX + 1] = {
[DCB_ATTR_IEEE_QCN_STATS] = {.len = sizeof(struct ieee_qcn_stats)},
};
-static const struct nla_policy dcbnl_ieee_app[DCB_ATTR_IEEE_APP_MAX + 1] = {
- [DCB_ATTR_IEEE_APP] = {.len = sizeof(struct dcb_app)},
-};
-
/* DCB number of traffic classes nested attributes. */
static const struct nla_policy dcbnl_featcfg_nest[DCB_FEATCFG_ATTR_MAX + 1] = {
[DCB_FEATCFG_ATTR_ALL] = {.type = NLA_FLAG},
@@ -1463,8 +1459,15 @@ static int dcbnl_ieee_set(struct net_device *netdev, struct nlmsghdr *nlh,
nla_for_each_nested(attr, ieee[DCB_ATTR_IEEE_APP_TABLE], rem) {
struct dcb_app *app_data;
+
if (nla_type(attr) != DCB_ATTR_IEEE_APP)
continue;
+
+ if (nla_len(attr) < sizeof(struct dcb_app)) {
+ err = -ERANGE;
+ goto err;
+ }
+
app_data = nla_data(attr);
if (ops->ieee_setapp)
err = ops->ieee_setapp(netdev, app_data);
--
2.11.0
next prev parent reply other threads:[~2017-05-19 16:56 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-19 16:55 [PATCH net-next 0/9] warning cleanups Stephen Hemminger
2017-05-19 16:55 ` Stephen Hemminger [this message]
2017-05-21 17:42 ` [PATCH net-next 1/9] dcb: enforce minimum length on IEEE_APPS attribute David Miller
2017-05-19 16:55 ` [PATCH net-next 2/9] ila: propagate error code in ila_output Stephen Hemminger
2017-05-21 17:43 ` David Miller
2017-05-19 16:55 ` [PATCH net-next 3/9] udp: make local function static Stephen Hemminger
2017-05-21 17:43 ` David Miller
2017-05-19 16:55 ` [PATCH net-next 4/9] inet: fix warning about missing prototype Stephen Hemminger
2017-05-21 17:43 ` David Miller
2017-05-19 16:55 ` [PATCH net-next 5/9] tcpnv: do not export local function Stephen Hemminger
2017-05-21 17:43 ` David Miller
2017-05-19 16:55 ` [PATCH net-next 6/9] xfrm: make xfrm_dev_register static Stephen Hemminger
2017-05-20 6:48 ` Steffen Klassert
2017-05-21 17:43 ` David Miller
2017-05-19 16:55 ` [PATCH net-next 7/9] fou: make local function static Stephen Hemminger
2017-05-21 17:43 ` David Miller
2017-05-19 16:55 ` [PATCH net-next 8/9] ipv6: drop unused variables in seg6_genl_dumphac Stephen Hemminger
2017-05-21 17:43 ` David Miller
2017-05-19 16:55 ` [PATCH net-next 9/9] ipv6: remove unused variables in esp6 Stephen Hemminger
2017-05-21 17:44 ` David Miller
2017-05-22 10:59 ` Steffen Klassert
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=20170519165556.483-2-sthemmin@microsoft.com \
--to=stephen@networkplumber.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sthemmin@microsoft.com \
/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.