Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 810851,
    "url": "http://patchwork.ozlabs.org/api/patches/810851/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170907060329.32402-8-bjorn.andersson@linaro.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": "<20170907060329.32402-8-bjorn.andersson@linaro.org>",
    "list_archive_url": null,
    "date": "2017-09-07T06:03:29",
    "name": "[7/7] net: qrtr: Support decoding incoming v2 packets",
    "commit_ref": null,
    "pull_url": null,
    "state": "deferred",
    "archived": true,
    "hash": "e9e7a54545012b2802d17f9fa0df1add7d80bd8e",
    "submitter": {
        "id": 68398,
        "url": "http://patchwork.ozlabs.org/api/people/68398/?format=api",
        "name": "Bjorn Andersson",
        "email": "bjorn.andersson@linaro.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/20170907060329.32402-8-bjorn.andersson@linaro.org/mbox/",
    "series": [
        {
            "id": 1911,
            "url": "http://patchwork.ozlabs.org/api/series/1911/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=1911",
            "date": "2017-09-07T06:03:24",
            "name": "net: qrtr: Fixes and support receiving version 2 packets",
            "version": 1,
            "mbox": "http://patchwork.ozlabs.org/series/1911/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/810851/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/810851/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<netdev-owner@vger.kernel.org>",
        "X-Original-To": "patchwork-incoming@ozlabs.org",
        "Delivered-To": "patchwork-incoming@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; dkim=pass (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"Lf1+CbSb\"; dkim-atps=neutral"
        ],
        "Received": [
            "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xnqfp4b6pz9sRV\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu,  7 Sep 2017 16:04:50 +1000 (AEST)",
            "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754068AbdIGGDp (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tThu, 7 Sep 2017 02:03:45 -0400",
            "from mail-pf0-f179.google.com ([209.85.192.179]:34269 \"EHLO\n\tmail-pf0-f179.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1754018AbdIGGDm (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Thu, 7 Sep 2017 02:03:42 -0400",
            "by mail-pf0-f179.google.com with SMTP id e1so2344146pfk.1\n\tfor <netdev@vger.kernel.org>; Wed, 06 Sep 2017 23:03:42 -0700 (PDT)",
            "from localhost.localdomain (ip68-111-217-79.sd.sd.cox.net.\n\t[68.111.217.79]) by smtp.gmail.com with ESMTPSA id\n\ts1sm2186650pfk.27.2017.09.06.23.03.40\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 06 Sep 2017 23:03:41 -0700 (PDT)"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=StanxJdbaw1SNc4T2/YT3g2/HEJBj5sy7ikfCMlZTNw=;\n\tb=Lf1+CbSbMvWwAa6s9a/9JeEdmICv4g9F2ZIBa/CyTnl/9Q6/IyLTGtsZg7m8tbYeLS\n\tvFN5s50xjhtle3skj/tsQHz3eTQaJVDNDsjTl/Z8QNj93rC/LDRe5Q1QMOH4TKLjJwyM\n\tM1b5nSWdGN7DAM4gTIzcn71F/K3veEf7+b5oY=",
        "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=StanxJdbaw1SNc4T2/YT3g2/HEJBj5sy7ikfCMlZTNw=;\n\tb=Kb0qdfSLeBns0NcPat6Y7xNcPqOAeJlwbjuovt88nDDDGr9ounInG3czzsVruqe1HS\n\tKfmPu0GNz8lIRiTWQnYR6Y3rQ6fkiiSRv0xEc90kBsWJRLXgUzP31iyXgBAW4FXfxJQk\n\tBp3VnbRmkxiiR46Q+5T9Sp4aNf6meeP4DbjK9mFDnXxZQP3F4Ige+vuMj7V61jUE9QvK\n\tG3B+Yd1UpOHU0dyGU1fIocIq+WIsSpctN5Nlgklnm7UDGOkulBFpdgPHI2W5uIaqcZiU\n\tISqgOyEXkiz963qZf7Jrqn8AG3rrrgYXhPFpX4RARhGk0ym2pS5lZCFc/jHNIkcOAUdv\n\tyFqg==",
        "X-Gm-Message-State": "AHPjjUjSx1Qq6lzq0BgNafLLf7hJ36oeu69sUavrQUnPHh/vd07glfST\n\tQer9ubMhiGceHXUH",
        "X-Google-Smtp-Source": "ADKCNb6N6HdHxpv+QeCttxF0zvIOjbD2Vv0on5Jyebhvj7XLPoeiSFeRjsdNmfGfcBzgEKKxrDYvvg==",
        "X-Received": "by 10.98.13.81 with SMTP id v78mr1609609pfi.61.1504764221625;\n\tWed, 06 Sep 2017 23:03:41 -0700 (PDT)",
        "From": "Bjorn Andersson <bjorn.andersson@linaro.org>",
        "To": "\"David S. Miller\" <davem@davemloft.net>",
        "Cc": "netdev@vger.kernel.org, linux-kernel@vger.kernel.org,\n\tlinux-arm-msm@vger.kernel.org, Chris Lew <clew@codeaurora.org>",
        "Subject": "[PATCH 7/7] net: qrtr: Support decoding incoming v2 packets",
        "Date": "Wed,  6 Sep 2017 23:03:29 -0700",
        "Message-Id": "<20170907060329.32402-8-bjorn.andersson@linaro.org>",
        "X-Mailer": "git-send-email 2.12.0",
        "In-Reply-To": "<20170907060329.32402-1-bjorn.andersson@linaro.org>",
        "References": "<20170907060329.32402-1-bjorn.andersson@linaro.org>",
        "Sender": "netdev-owner@vger.kernel.org",
        "Precedence": "bulk",
        "List-ID": "<netdev.vger.kernel.org>",
        "X-Mailing-List": "netdev@vger.kernel.org"
    },
    "content": "Add the necessary logic for decoding incoming messages of version 2 as\nwell. Also make sure there's room for the bigger of version 1 and 2\nheaders in the code allocating skbs for outgoing messages.\n\nSigned-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>\n---\n net/qrtr/qrtr.c | 132 ++++++++++++++++++++++++++++++++++++++++----------------\n 1 file changed, 94 insertions(+), 38 deletions(-)",
    "diff": "diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c\nindex 5042999756ce..5f397fa1c109 100644\n--- a/net/qrtr/qrtr.c\n+++ b/net/qrtr/qrtr.c\n@@ -20,14 +20,15 @@\n \n #include \"qrtr.h\"\n \n-#define QRTR_PROTO_VER 1\n+#define QRTR_PROTO_VER_1 1\n+#define QRTR_PROTO_VER_2 3\n \n /* auto-bind range */\n #define QRTR_MIN_EPH_SOCKET 0x4000\n #define QRTR_MAX_EPH_SOCKET 0x7fff\n \n /**\n- * struct qrtr_hdr - (I|R)PCrouter packet header\n+ * struct qrtr_hdr_v1 - (I|R)PCrouter packet header version 1\n  * @version: protocol version\n  * @type: packet type; one of QRTR_TYPE_*\n  * @src_node_id: source node\n@@ -37,7 +38,7 @@\n  * @dst_node_id: destination node\n  * @dst_port_id: destination port\n  */\n-struct qrtr_hdr {\n+struct qrtr_hdr_v1 {\n \t__le32 version;\n \t__le32 type;\n \t__le32 src_node_id;\n@@ -48,6 +49,32 @@ struct qrtr_hdr {\n \t__le32 dst_port_id;\n } __packed;\n \n+/**\n+ * struct qrtr_hdr_v2 - (I|R)PCrouter packet header later versions\n+ * @version: protocol version\n+ * @type: packet type; one of QRTR_TYPE_*\n+ * @flags: bitmask of QRTR_FLAGS_*\n+ * @optlen: length of optional header data\n+ * @size: length of packet, excluding this header and optlen\n+ * @src_node_id: source node\n+ * @src_port_id: source port\n+ * @dst_node_id: destination node\n+ * @dst_port_id: destination port\n+ */\n+struct qrtr_hdr_v2 {\n+\tu8 version;\n+\tu8 type;\n+\tu8 flags;\n+\tu8 optlen;\n+\t__le32 size;\n+\t__le16 src_node_id;\n+\t__le16 src_port_id;\n+\t__le16 dst_node_id;\n+\t__le16 dst_port_id;\n+} __packed;\n+\n+#define QRTR_FLAGS_CONFIRM_RX\tBIT(0)\n+\n struct qrtr_cb {\n \tu32 src_node;\n \tu32 src_port;\n@@ -58,7 +85,8 @@ struct qrtr_cb {\n \tu8 confirm_rx;\n };\n \n-#define QRTR_HDR_SIZE sizeof(struct qrtr_hdr)\n+#define QRTR_HDR_MAX_SIZE max_t(size_t, sizeof(struct qrtr_hdr_v1), \\\n+\t\t\t\t\tsizeof(struct qrtr_hdr_v2))\n \n struct qrtr_sock {\n \t/* WARNING: sk must be the first member */\n@@ -154,12 +182,12 @@ static int qrtr_node_enqueue(struct qrtr_node *node, struct sk_buff *skb,\n \t\t\t     int type, struct sockaddr_qrtr *from,\n \t\t\t     struct sockaddr_qrtr *to)\n {\n-\tstruct qrtr_hdr *hdr;\n+\tstruct qrtr_hdr_v1 *hdr;\n \tsize_t len = skb->len;\n \tint rc = -ENODEV;\n \n-\thdr = skb_push(skb, QRTR_HDR_SIZE);\n-\thdr->version = cpu_to_le32(QRTR_PROTO_VER);\n+\thdr = skb_push(skb, sizeof(*hdr));\n+\thdr->version = cpu_to_le32(QRTR_PROTO_VER_1);\n \thdr->type = cpu_to_le32(type);\n \thdr->src_node_id = cpu_to_le32(from->sq_node);\n \thdr->src_port_id = cpu_to_le32(from->sq_port);\n@@ -224,52 +252,80 @@ static void qrtr_node_assign(struct qrtr_node *node, unsigned int nid)\n int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)\n {\n \tstruct qrtr_node *node = ep->node;\n-\tconst struct qrtr_hdr *phdr = data;\n+\tconst struct qrtr_hdr_v1 *v1;\n+\tconst struct qrtr_hdr_v2 *v2;\n \tstruct sk_buff *skb;\n \tstruct qrtr_cb *cb;\n-\tunsigned int psize;\n \tunsigned int size;\n-\tunsigned int type;\n \tunsigned int ver;\n-\tunsigned int dst;\n+\tsize_t hdrlen;\n \n-\tif (len < QRTR_HDR_SIZE || len & 3)\n+\tif (len & 3)\n \t\treturn -EINVAL;\n \n-\tver = le32_to_cpu(phdr->version);\n-\tsize = le32_to_cpu(phdr->size);\n-\ttype = le32_to_cpu(phdr->type);\n-\tdst = le32_to_cpu(phdr->dst_port_id);\n+\tskb = netdev_alloc_skb(NULL, len);\n+\tif (!skb)\n+\t\treturn -ENOMEM;\n \n-\tpsize = (size + 3) & ~3;\n+\tcb = (struct qrtr_cb *)skb->cb;\n \n-\tif (ver != QRTR_PROTO_VER)\n-\t\treturn -EINVAL;\n+\t/* Version field in v1 is little endian, so this works for both cases */\n+\tver = *(u8 *)data;\n \n-\tif (len != psize + QRTR_HDR_SIZE)\n-\t\treturn -EINVAL;\n+\tswitch (ver) {\n+\tcase QRTR_PROTO_VER_1:\n+\t\tv1 = data;\n+\t\thdrlen = sizeof(*v1);\n \n-\tif (dst != QRTR_PORT_CTRL && type != QRTR_TYPE_DATA)\n-\t\treturn -EINVAL;\n+\t\tcb->type = le32_to_cpu(v1->type);\n+\t\tcb->src_node = le32_to_cpu(v1->src_node_id);\n+\t\tcb->src_port = le32_to_cpu(v1->src_port_id);\n+\t\tcb->confirm_rx = !!v1->confirm_rx;\n+\t\tcb->dst_node = le32_to_cpu(v1->dst_node_id);\n+\t\tcb->dst_port = le32_to_cpu(v1->dst_port_id);\n \n-\tskb = netdev_alloc_skb(NULL, len);\n-\tif (!skb)\n-\t\treturn -ENOMEM;\n+\t\tsize = le32_to_cpu(v1->size);\n+\t\tbreak;\n+\tcase QRTR_PROTO_VER_2:\n+\t\tv2 = data;\n+\t\thdrlen = sizeof(*v2) + v2->optlen;\n+\n+\t\tcb->type = v2->type;\n+\t\tcb->confirm_rx = !!(v2->flags & QRTR_FLAGS_CONFIRM_RX);\n+\t\tcb->src_node = le16_to_cpu(v2->src_node_id);\n+\t\tcb->src_port = le16_to_cpu(v2->src_port_id);\n+\t\tcb->dst_node = le16_to_cpu(v2->dst_node_id);\n+\t\tcb->dst_port = le16_to_cpu(v2->dst_port_id);\n+\n+\t\tif (cb->src_port == (u16)QRTR_PORT_CTRL)\n+\t\t\tcb->src_port = QRTR_PORT_CTRL;\n+\t\tif (cb->dst_port == (u16)QRTR_PORT_CTRL)\n+\t\t\tcb->dst_port = QRTR_PORT_CTRL;\n+\n+\t\tsize = le32_to_cpu(v2->size);\n+\t\tbreak;\n+\tdefault:\n+\t\tpr_err(\"qrtr: Invalid version %d\\n\", ver);\n+\t\tgoto err;\n+\t}\n \n-\tcb = (struct qrtr_cb *)skb->cb;\n-\tcb->src_node = le32_to_cpu(phdr->src_node_id);\n-\tcb->src_port = le32_to_cpu(phdr->src_port_id);\n-\tcb->dst_node = le32_to_cpu(phdr->dst_node_id);\n-\tcb->dst_port = le32_to_cpu(phdr->dst_port_id);\n-\tcb->type = type;\n-\tcb->confirm_rx = !!phdr->confirm_rx;\n+\tif (len != ALIGN(size, 4) + hdrlen)\n+\t\tgoto err;\n \n-\tskb_put_data(skb, data + QRTR_HDR_SIZE, size);\n+\tif (cb->dst_port != QRTR_PORT_CTRL && cb->type != QRTR_TYPE_DATA)\n+\t\tgoto err;\n+\n+\tskb_put_data(skb, data + hdrlen, size);\n \n \tskb_queue_tail(&node->rx_queue, skb);\n \tschedule_work(&node->work);\n \n \treturn 0;\n+\n+err:\n+\tkfree_skb(skb);\n+\treturn -EINVAL;\n+\n }\n EXPORT_SYMBOL_GPL(qrtr_endpoint_post);\n \n@@ -287,11 +343,11 @@ static struct sk_buff *qrtr_alloc_ctrl_packet(struct qrtr_ctrl_pkt **pkt)\n \tconst int pkt_len = sizeof(struct qrtr_ctrl_pkt);\n \tstruct sk_buff *skb;\n \n-\tskb = alloc_skb(QRTR_HDR_SIZE + pkt_len, GFP_KERNEL);\n+\tskb = alloc_skb(QRTR_HDR_MAX_SIZE + pkt_len, GFP_KERNEL);\n \tif (!skb)\n \t\treturn NULL;\n \n-\tskb_reserve(skb, QRTR_HDR_SIZE);\n+\tskb_reserve(skb, QRTR_HDR_MAX_SIZE);\n \t*pkt = skb_put_zero(skb, pkt_len);\n \n \treturn skb;\n@@ -720,12 +776,12 @@ static int qrtr_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)\n \t}\n \n \tplen = (len + 3) & ~3;\n-\tskb = sock_alloc_send_skb(sk, plen + QRTR_HDR_SIZE,\n+\tskb = sock_alloc_send_skb(sk, plen + QRTR_HDR_MAX_SIZE,\n \t\t\t\t  msg->msg_flags & MSG_DONTWAIT, &rc);\n \tif (!skb)\n \t\tgoto out_node;\n \n-\tskb_reserve(skb, QRTR_HDR_SIZE);\n+\tskb_reserve(skb, QRTR_HDR_MAX_SIZE);\n \n \trc = memcpy_from_msg(skb_put(skb, len), msg, len);\n \tif (rc) {\n",
    "prefixes": [
        "7/7"
    ]
}