Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/980274/?format=api
{ "id": 980274, "url": "http://patchwork.ozlabs.org/api/patches/980274/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20181008031644.15989-8-dsahern@kernel.org/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20181008031644.15989-8-dsahern@kernel.org>", "list_archive_url": null, "date": "2018-10-08T03:16:28", "name": "[v2,net-next,07/23] net/ipv4: Update inet_dump_ifaddr for strict data checking", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "2e193b34d480182c9aea3d0b26dfcda26afc5950", "submitter": { "id": 74101, "url": "http://patchwork.ozlabs.org/api/people/74101/?format=api", "name": "David Ahern", "email": "dsahern@kernel.org" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20181008031644.15989-8-dsahern@kernel.org/mbox/", "series": [ { "id": 69470, "url": "http://patchwork.ozlabs.org/api/series/69470/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=69470", "date": "2018-10-08T03:16:21", "name": "rtnetlink: Add support for rigid checking of data in dump request", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/69470/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/980274/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/980274/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming-netdev@ozlabs.org", "Delivered-To": "patchwork-incoming-netdev@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=pass (p=none dis=none) header.from=kernel.org", "ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=kernel.org header.i=@kernel.org\n\theader.b=\"SXS9RDRf\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 42T5Bt6g0Hz9sCr\n\tfor <patchwork-incoming-netdev@ozlabs.org>;\n\tMon, 8 Oct 2018 14:17:26 +1100 (AEDT)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1726935AbeJHK0T (ORCPT\n\t<rfc822;patchwork-incoming-netdev@ozlabs.org>);\n\tMon, 8 Oct 2018 06:26:19 -0400", "from mail.kernel.org ([198.145.29.99]:42610 \"EHLO mail.kernel.org\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1726113AbeJHK0T (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tMon, 8 Oct 2018 06:26:19 -0400", "from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com\n\t[216.129.126.126])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby mail.kernel.org (Postfix) with ESMTPSA id B2C05213A2;\n\tMon, 8 Oct 2018 03:16:48 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=default; t=1538968608;\n\tbh=yomsfFq6qmFcdtbWfmV5G9I3/XHyEefP0mxcXVuMV0U=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=SXS9RDRfOD2iOit9y1P5xnCX0L7tKvkaegCIAsRJED8DwPsnDm2TIgSaycQrLXnFd\n\tZWQUPN9dJv0UU1S0awoX4SdMabo4Nvp6JyrsmAUfNuMs+Iy9IkScAeu7tI3CDe/oFD\n\tzLCmnVG0DD2hO6IEFXm+9+nzeL4Xj9RyxK4GVmbY=", "From": "David Ahern <dsahern@kernel.org>", "To": "netdev@vger.kernel.org, davem@davemloft.net", "Cc": "christian@brauner.io, jbenc@redhat.com, stephen@networkplumber.org,\n\tDavid Ahern <dsahern@gmail.com>", "Subject": "[PATCH v2 net-next 07/23] net/ipv4: Update inet_dump_ifaddr for\n\tstrict data checking", "Date": "Sun, 7 Oct 2018 20:16:28 -0700", "Message-Id": "<20181008031644.15989-8-dsahern@kernel.org>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": "<20181008031644.15989-1-dsahern@kernel.org>", "References": "<20181008031644.15989-1-dsahern@kernel.org>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "From: David Ahern <dsahern@gmail.com>\n\nUpdate inet_dump_ifaddr for strict data checking. If the flag is set,\nthe dump request is expected to have an ifaddrmsg struct as the header\npotentially followed by one or more attributes. Any data passed in the\nheader or as an attribute is taken as a request to influence the data\nreturned. Only values supported by the dump handler are allowed to be\nnon-0 or set in the request. At the moment only the IFA_TARGET_NETNSID\nattribute is supported. Follow on patches can support for other fields\n(e.g., honor ifa_index and only return data for the given device index).\n\nSigned-off-by: David Ahern <dsahern@gmail.com>\n---\n net/ipv4/devinet.c | 72 +++++++++++++++++++++++++++++++++++++++++++++---------\n 1 file changed, 61 insertions(+), 11 deletions(-)", "diff": "diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c\nindex ab2b11df5ea4..6f2bbd04e950 100644\n--- a/net/ipv4/devinet.c\n+++ b/net/ipv4/devinet.c\n@@ -1660,17 +1660,70 @@ static int inet_fill_ifaddr(struct sk_buff *skb, struct in_ifaddr *ifa,\n \treturn -EMSGSIZE;\n }\n \n+static int inet_valid_dump_ifaddr_req(const struct nlmsghdr *nlh,\n+\t\t\t\t struct inet_fill_args *fillargs,\n+\t\t\t\t struct net **tgt_net, struct sock *sk,\n+\t\t\t\t struct netlink_ext_ack *extack)\n+{\n+\tstruct nlattr *tb[IFA_MAX+1];\n+\tstruct ifaddrmsg *ifm;\n+\tint err, i;\n+\n+\tif (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifm))) {\n+\t\tNL_SET_ERR_MSG(extack, \"ipv4: Invalid header for address dump request\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tifm = nlmsg_data(nlh);\n+\tif (ifm->ifa_prefixlen || ifm->ifa_flags || ifm->ifa_scope) {\n+\t\tNL_SET_ERR_MSG(extack, \"ipv4: Invalid values in header for address dump request\");\n+\t\treturn -EINVAL;\n+\t}\n+\tif (ifm->ifa_index) {\n+\t\tNL_SET_ERR_MSG(extack, \"ipv4: Filter by device index not supported for address dump\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\terr = nlmsg_parse_strict(nlh, sizeof(*ifm), tb, IFA_MAX,\n+\t\t\t\t ifa_ipv4_policy, extack);\n+\tif (err < 0)\n+\t\treturn err;\n+\n+\tfor (i = 0; i <= IFA_MAX; ++i) {\n+\t\tif (!tb[i])\n+\t\t\tcontinue;\n+\n+\t\tif (i == IFA_TARGET_NETNSID) {\n+\t\t\tstruct net *net;\n+\n+\t\t\tfillargs->netnsid = nla_get_s32(tb[i]);\n+\n+\t\t\tnet = rtnl_get_net_ns_capable(sk, fillargs->netnsid);\n+\t\t\tif (IS_ERR(net)) {\n+\t\t\t\tNL_SET_ERR_MSG(extack, \"ipv4: Invalid target network namespace id\");\n+\t\t\t\treturn PTR_ERR(net);\n+\t\t\t}\n+\t\t\t*tgt_net = net;\n+\t\t} else {\n+\t\t\tNL_SET_ERR_MSG(extack, \"ipv4: Unsupported attribute in dump request\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)\n {\n+\tconst struct nlmsghdr *nlh = cb->nlh;\n \tstruct inet_fill_args fillargs = {\n \t\t.portid = NETLINK_CB(cb->skb).portid,\n-\t\t.seq = cb->nlh->nlmsg_seq,\n+\t\t.seq = nlh->nlmsg_seq,\n \t\t.event = RTM_NEWADDR,\n \t\t.flags = NLM_F_MULTI,\n \t\t.netnsid = -1,\n \t};\n \tstruct net *net = sock_net(skb->sk);\n-\tstruct nlattr *tb[IFA_MAX+1];\n \tstruct net *tgt_net = net;\n \tint h, s_h;\n \tint idx, s_idx;\n@@ -1684,16 +1737,13 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)\n \ts_idx = idx = cb->args[1];\n \ts_ip_idx = ip_idx = cb->args[2];\n \n-\tif (nlmsg_parse(cb->nlh, sizeof(struct ifaddrmsg), tb, IFA_MAX,\n-\t\t\tifa_ipv4_policy, cb->extack) >= 0) {\n-\t\tif (tb[IFA_TARGET_NETNSID]) {\n-\t\t\tfillargs.netnsid = nla_get_s32(tb[IFA_TARGET_NETNSID]);\n+\tif (cb->strict_check) {\n+\t\tint err;\n \n-\t\t\ttgt_net = rtnl_get_net_ns_capable(skb->sk,\n-\t\t\t\t\t\t\t fillargs.netnsid);\n-\t\t\tif (IS_ERR(tgt_net))\n-\t\t\t\treturn PTR_ERR(tgt_net);\n-\t\t}\n+\t\terr = inet_valid_dump_ifaddr_req(nlh, &fillargs, &tgt_net,\n+\t\t\t\t\t\t skb->sk, cb->extack);\n+\t\tif (err < 0)\n+\t\t\treturn err;\n \t}\n \n \tfor (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {\n", "prefixes": [ "v2", "net-next", "07/23" ] }