{"id":809456,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809456/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504478625-13330-2-git-send-email-pablo@netfilter.org/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/projects/26/?format=json","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":"<1504478625-13330-2-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-03T22:43:45","name":"[47/47] netfilter: rt: account for tcp header size too","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"b95042891414124cc948e83a025fa7144246ab0f","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/1.2/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/1.2/users/6139/?format=json","username":"pablo","first_name":"Pablo","last_name":"Neira","email":"pablo@netfilter.org"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504478625-13330-2-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1282,"url":"http://patchwork.ozlabs.org/api/1.2/series/1282/?format=json","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/809456/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809456/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlp1l0c50z9s8J\n\tfor ;\n\tMon, 4 Sep 2017 08:44:11 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753172AbdICWn7 (ORCPT );\n\tSun, 3 Sep 2017 18:43:59 -0400","from mail.us.es ([193.147.175.20]:53220 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753056AbdICWn6 (ORCPT );\n\tSun, 3 Sep 2017 18:43:58 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 6E2FA190F61\n\tfor ;\n\tMon, 4 Sep 2017 00:43:31 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 5E478B502D\n\tfor ;\n\tMon, 4 Sep 2017 00:43:31 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 54154B5027; Mon, 4 Sep 2017 00:43:31 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 35719B5027;\n\tMon, 4 Sep 2017 00:43:29 +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:43:29 +0200 (CEST)","from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id E03C94265A20;\n\tMon, 4 Sep 2017 00:43:28 +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 ","To":"netfilter-devel@vger.kernel.org","Cc":"davem@davemloft.net, netdev@vger.kernel.org","Subject":"[PATCH 47/47] netfilter: rt: account for tcp header size too","Date":"Mon, 4 Sep 2017 00:43:45 +0200","Message-Id":"<1504478625-13330-2-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504478625-13330-1-git-send-email-pablo@netfilter.org>","References":"<1504478625-13330-1-git-send-email-pablo@netfilter.org>","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"From: Florian Westphal \n\nThis needs to accout for the ipv4/ipv6 header size and the tcp\nheader without options.\n\nFixes: 6b5dc98e8fac0 (\"netfilter: rt: add support to fetch path mss\")\nReported-by: Matteo Croce \nSigned-off-by: Florian Westphal \nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nft_rt.c | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)","diff":"diff --git a/net/netfilter/nft_rt.c b/net/netfilter/nft_rt.c\nindex 61fd3acaa3c9..a6b7d05aeacf 100644\n--- a/net/netfilter/nft_rt.c\n+++ b/net/netfilter/nft_rt.c\n@@ -35,10 +35,11 @@ static u16 get_tcpmss(const struct nft_pktinfo *pkt, const struct dst_entry *skb\n \tswitch (nft_pf(pkt)) {\n \tcase NFPROTO_IPV4:\n \t\tfl.u.ip4.daddr = ip_hdr(skb)->saddr;\n-\t\tminlen = sizeof(struct iphdr);\n+\t\tminlen = sizeof(struct iphdr) + sizeof(struct tcphdr);\n \t\tbreak;\n \tcase NFPROTO_IPV6:\n \t\tfl.u.ip6.daddr = ipv6_hdr(skb)->saddr;\n+\t\tminlen = sizeof(struct ipv6hdr) + sizeof(struct tcphdr);\n \t\tbreak;\n \t}\n \n","prefixes":["47/47"]}