Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/809468/?format=api
{ "id": 809468, "url": "http://patchwork.ozlabs.org/api/1.2/patches/809468/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504478435-13160-5-git-send-email-pablo@netfilter.org/", "project": { "id": 26, "url": "http://patchwork.ozlabs.org/api/1.2/projects/26/?format=api", "name": "Netfilter Development", "link_name": "netfilter-devel", "list_id": "netfilter-devel.vger.kernel.org", "list_email": "netfilter-devel@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1504478435-13160-5-git-send-email-pablo@netfilter.org>", "list_archive_url": null, "date": "2017-09-03T22:40:15", "name": "[27/47] netfilter: exthdr: factor out tcp option access", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "06d94304e9195b63f8eb4456c0fa676e6d37cd98", "submitter": { "id": 1315, "url": "http://patchwork.ozlabs.org/api/1.2/people/1315/?format=api", "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org" }, "delegate": { "id": 6139, "url": "http://patchwork.ozlabs.org/api/1.2/users/6139/?format=api", "username": "pablo", "first_name": "Pablo", "last_name": "Neira", "email": "pablo@netfilter.org" }, "mbox": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504478435-13160-5-git-send-email-pablo@netfilter.org/mbox/", "series": [ { "id": 1282, "url": "http://patchwork.ozlabs.org/api/1.2/series/1282/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=1282", "date": "2017-09-03T22:40:11", "name": null, "version": 1, "mbox": "http://patchwork.ozlabs.org/series/1282/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809468/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809468/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netfilter-devel-owner@vger.kernel.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.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=netfilter-devel-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlp3M60Tvz9s06\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 4 Sep 2017 08:45:35 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753242AbdICWk4 (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n\tSun, 3 Sep 2017 18:40:56 -0400", "from mail.us.es ([193.147.175.20]:52696 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753265AbdICWky (ORCPT <rfc822; netfilter-devel@vger.kernel.org>);\n\tSun, 3 Sep 2017 18:40:54 -0400", "from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 922E3190F66\n\tfor <netfilter-devel@vger.kernel.org>;\n\tMon, 4 Sep 2017 00:40:27 +0200 (CEST)", "from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 767AFB5041\n\tfor <netfilter-devel@vger.kernel.org>;\n\tMon, 4 Sep 2017 00:40:27 +0200 (CEST)", "by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 6C1C0B5030; Mon, 4 Sep 2017 00:40:27 +0200 (CEST)", "from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 65004B5027;\n\tMon, 4 Sep 2017 00:40:25 +0200 (CEST)", "from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tMon, 04 Sep 2017 00:40:25 +0200 (CEST)", "from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: 1984lsi)\n\tby entrada.int (Postfix) with ESMTPA id 1B4A84265A20;\n\tMon, 4 Sep 2017 00:40:25 +0200 (CEST)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int", "X-Spam-Level": "", "X-Spam-Status": "No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1", "X-Virus-Status": "clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)", "X-SMTPAUTHUS": "auth mail.us.es", "From": "Pablo Neira Ayuso <pablo@netfilter.org>", "To": "netfilter-devel@vger.kernel.org", "Cc": "davem@davemloft.net, netdev@vger.kernel.org", "Subject": "[PATCH 27/47] netfilter: exthdr: factor out tcp option access", "Date": "Mon, 4 Sep 2017 00:40:15 +0200", "Message-Id": "<1504478435-13160-5-git-send-email-pablo@netfilter.org>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1504478435-13160-1-git-send-email-pablo@netfilter.org>", "References": "<1504478435-13160-1-git-send-email-pablo@netfilter.org>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Sender": "netfilter-devel-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netfilter-devel.vger.kernel.org>", "X-Mailing-List": "netfilter-devel@vger.kernel.org" }, "content": "From: Florian Westphal <fw@strlen.de>\n\nSigned-off-by: Florian Westphal <fw@strlen.de>\nSigned-off-by: Pablo Neira Ayuso <pablo@netfilter.org>\n---\n net/netfilter/nft_exthdr.c | 33 +++++++++++++++++++++------------\n 1 file changed, 21 insertions(+), 12 deletions(-)", "diff": "diff --git a/net/netfilter/nft_exthdr.c b/net/netfilter/nft_exthdr.c\nindex 1ec49fe5845f..921c95f2c583 100644\n--- a/net/netfilter/nft_exthdr.c\n+++ b/net/netfilter/nft_exthdr.c\n@@ -61,6 +61,26 @@ static void nft_exthdr_ipv6_eval(const struct nft_expr *expr,\n \tregs->verdict.code = NFT_BREAK;\n }\n \n+static void *\n+nft_tcp_header_pointer(const struct nft_pktinfo *pkt,\n+\t\t unsigned int len, void *buffer, unsigned int *tcphdr_len)\n+{\n+\tstruct tcphdr *tcph;\n+\n+\tif (!pkt->tprot_set || pkt->tprot != IPPROTO_TCP)\n+\t\treturn NULL;\n+\n+\ttcph = skb_header_pointer(pkt->skb, pkt->xt.thoff, sizeof(*tcph), buffer);\n+\tif (!tcph)\n+\t\treturn NULL;\n+\n+\t*tcphdr_len = __tcp_hdrlen(tcph);\n+\tif (*tcphdr_len < sizeof(*tcph) || *tcphdr_len > len)\n+\t\treturn NULL;\n+\n+\treturn skb_header_pointer(pkt->skb, pkt->xt.thoff, *tcphdr_len, buffer);\n+}\n+\n static void nft_exthdr_tcp_eval(const struct nft_expr *expr,\n \t\t\t\tstruct nft_regs *regs,\n \t\t\t\tconst struct nft_pktinfo *pkt)\n@@ -72,18 +92,7 @@ static void nft_exthdr_tcp_eval(const struct nft_expr *expr,\n \tstruct tcphdr *tcph;\n \tu8 *opt;\n \n-\tif (!pkt->tprot_set || pkt->tprot != IPPROTO_TCP)\n-\t\tgoto err;\n-\n-\ttcph = skb_header_pointer(pkt->skb, pkt->xt.thoff, sizeof(*tcph), buff);\n-\tif (!tcph)\n-\t\tgoto err;\n-\n-\ttcphdr_len = __tcp_hdrlen(tcph);\n-\tif (tcphdr_len < sizeof(*tcph))\n-\t\tgoto err;\n-\n-\ttcph = skb_header_pointer(pkt->skb, pkt->xt.thoff, tcphdr_len, buff);\n+\ttcph = nft_tcp_header_pointer(pkt, sizeof(buff), buff, &tcphdr_len);\n \tif (!tcph)\n \t\tgoto err;\n \n", "prefixes": [ "27/47" ] }