From: David Ahern <dsahern@kernel.org>
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: christian@brauner.io, jbenc@redhat.com,
stephen@networkplumber.org, David Ahern <dsahern@gmail.com>
Subject: [PATCH net-next 12/20] rtnetlink: Update ipmr_rtm_dumplink for strict data checking
Date: Thu, 4 Oct 2018 14:33:47 -0700 [thread overview]
Message-ID: <20181004213355.14899-13-dsahern@kernel.org> (raw)
In-Reply-To: <20181004213355.14899-1-dsahern@kernel.org>
From: David Ahern <dsahern@gmail.com>
Update ipmr_rtm_dumplink for strict data checking. If the flag is set,
the dump request is expected to have an ifinfomsg struct as the header.
All elements of the struct are expected to be 0 and no attributes can
be appended.
Signed-off-by: David Ahern <dsahern@gmail.com>
---
net/ipv4/ipmr.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 5660adcf7a04..e6c48e08d53d 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -2710,6 +2710,31 @@ static bool ipmr_fill_vif(struct mr_table *mrt, u32 vifid, struct sk_buff *skb)
return true;
}
+static int ipmr_valid_dumplink(const struct nlmsghdr *nlh,
+ struct netlink_ext_ack *extack)
+{
+ struct ifinfomsg *ifm;
+
+ if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifm))) {
+ NL_SET_ERR_MSG(extack, "Invalid header");
+ return -EINVAL;
+ }
+
+ if (nlh->nlmsg_len > nlmsg_msg_size(sizeof(*ifm))) {
+ NL_SET_ERR_MSG(extack, "Invalid data after header");
+ return -EINVAL;
+ }
+
+ ifm = nlmsg_data(nlh);
+ if (ifm->__ifi_pad || ifm->ifi_type || ifm->ifi_flags ||
+ ifm->ifi_change || ifm->ifi_index) {
+ NL_SET_ERR_MSG(extack, "Invalid values in header for dump request");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static int ipmr_rtm_dumplink(struct sk_buff *skb, struct netlink_callback *cb)
{
struct net *net = sock_net(skb->sk);
@@ -2718,6 +2743,13 @@ static int ipmr_rtm_dumplink(struct sk_buff *skb, struct netlink_callback *cb)
unsigned int e = 0, s_e;
struct mr_table *mrt;
+ if (cb->strict_check) {
+ int err = ipmr_valid_dumplink(cb->nlh, cb->extack);
+
+ if (err)
+ return err;
+ }
+
s_t = cb->args[0];
s_e = cb->args[1];
--
2.11.0
next prev parent reply other threads:[~2018-10-05 4:29 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 21:33 [PATCH net-next 00/20] rtnetlink: Add support for rigid checking of data in dump request David Ahern
2018-10-04 21:33 ` [PATCH net-next 01/20] netlink: Pass extack to dump handlers David Ahern
2018-10-05 17:41 ` Christian Brauner
2018-10-04 21:33 ` [PATCH net-next 02/20] netlink: Add extack message to nlmsg_parse for invalid header length David Ahern
2018-10-05 17:41 ` Christian Brauner
2018-10-04 21:33 ` [PATCH net-next 03/20] net: Add extack to nlmsg_parse David Ahern
2018-10-05 17:39 ` Christian Brauner
2018-10-05 18:42 ` David Ahern
2018-10-04 21:33 ` [PATCH net-next 04/20] net/ipv6: Refactor address dump to push inet6_fill_args to in6_dump_addrs David Ahern
2018-10-04 21:33 ` [PATCH net-next 05/20] netlink: Add new socket option to enable strict checking on dumps David Ahern
2018-10-05 17:36 ` Christian Brauner
2018-10-05 18:43 ` David Ahern
2018-10-05 18:45 ` Christian Brauner
2018-10-04 21:33 ` [PATCH net-next 06/20] net/ipv4: Update inet_dump_ifaddr for strict data checking David Ahern
2018-10-05 18:02 ` Christian Brauner
2018-10-05 18:48 ` David Ahern
2018-10-04 21:33 ` [PATCH net-next 07/20] net/ipv6: Update inet6_dump_addr " David Ahern
2018-10-05 17:53 ` Christian Brauner
2018-10-04 21:33 ` [PATCH net-next 08/20] rtnetlink: Update rtnl_dump_ifinfo " David Ahern
2018-10-05 17:59 ` Christian Brauner
2018-10-05 19:22 ` David Ahern
2018-10-07 10:29 ` Christian Brauner
2018-10-08 1:29 ` David Ahern
2018-10-08 9:47 ` Christian Brauner
2018-10-04 21:33 ` [PATCH net-next 09/20] rtnetlink: Update rtnl_bridge_getlink " David Ahern
2018-10-07 10:36 ` Christian Brauner
2018-10-08 1:31 ` David Ahern
2018-10-04 21:33 ` [PATCH net-next 10/20] rtnetlink: Update rtnl_stats_dump " David Ahern
2018-10-07 10:38 ` Christian Brauner
2018-10-04 21:33 ` [PATCH net-next 11/20] rtnetlink: Update inet6_dump_ifinfo " David Ahern
2018-10-05 17:48 ` Christian Brauner
2018-10-05 17:49 ` Christian Brauner
2018-10-05 19:25 ` David Ahern
2018-10-07 10:25 ` Christian Brauner
2018-10-05 17:54 ` Christian Brauner
2018-10-05 19:26 ` David Ahern
2018-10-07 10:23 ` Christian Brauner
2018-10-04 21:33 ` David Ahern [this message]
2018-10-07 10:40 ` [PATCH net-next 12/20] rtnetlink: Update ipmr_rtm_dumplink " Christian Brauner
2018-10-08 1:32 ` David Ahern
2018-10-04 21:33 ` [PATCH net-next 13/20] rtnetlink: Update fib dumps " David Ahern
2018-10-07 10:43 ` Christian Brauner
2018-10-04 21:33 ` [PATCH net-next 14/20] net/neighbor: Update neigh_dump_info " David Ahern
2018-10-07 10:46 ` Christian Brauner
2018-10-04 21:33 ` [PATCH net-next 15/20] net/neighbor: Update neightbl_dump_info " David Ahern
2018-10-07 10:48 ` Christian Brauner
2018-10-08 1:34 ` David Ahern
2018-10-04 21:33 ` [PATCH net-next 16/20] net/namespace: Update rtnl_net_dumpid " David Ahern
2018-10-05 17:45 ` Christian Brauner
2018-10-04 21:33 ` [PATCH net-next 17/20] net/fib_rules: Update fib_nl_dumprule " David Ahern
2018-10-07 10:55 ` Christian Brauner
2018-10-04 21:33 ` [PATCH net-next 18/20] net/ipv6: Update ip6addrlbl_dump " David Ahern
2018-10-07 10:54 ` Christian Brauner
2018-10-04 21:33 ` [PATCH net-next 19/20] net: Update netconf dump handlers " David Ahern
2018-10-07 10:53 ` Christian Brauner
2018-10-08 1:38 ` David Ahern
2018-10-04 21:33 ` [PATCH net-next 20/20] net/bridge: Update br_mdb_dump " David Ahern
2018-10-05 7:34 ` David Miller
2018-10-05 15:49 ` David Ahern
2018-10-05 17:28 ` Christian Brauner
2018-10-05 21:18 ` [PATCH net-next 00/20] rtnetlink: Add support for rigid checking of data in dump request David Ahern
2018-10-05 21:58 ` David Miller
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=20181004213355.14899-13-dsahern@kernel.org \
--to=dsahern@kernel.org \
--cc=christian@brauner.io \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=jbenc@redhat.com \
--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).