From patchwork Sun Dec 25 01:57:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 133183 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 33E08B7093 for ; Sun, 25 Dec 2011 12:59:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758089Ab1LYB6q (ORCPT ); Sat, 24 Dec 2011 20:58:46 -0500 Received: from mail.us.es ([193.147.175.20]:56027 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758041Ab1LYB6M (ORCPT ); Sat, 24 Dec 2011 20:58:12 -0500 Received: (qmail 26287 invoked from network); 25 Dec 2011 02:58:11 +0100 Received: from unknown (HELO us.es) (192.168.2.11) by us.es with SMTP; 25 Dec 2011 02:58:11 +0100 Received: (qmail 26307 invoked by uid 507); 25 Dec 2011 01:58:10 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on antivirus1 X-Spam-Level: X-Spam-Status: No, score=-96.5 required=7.5 tests=BAYES_50,KHOP_DYNAMIC, RCVD_IN_PBL, RCVD_IN_RP_RNBL, RCVD_IN_SORBS_DUL, RDNS_DYNAMIC, USER_IN_WHITELIST autolearn=disabled version=3.3.1 Received: from 127.0.0.1 by antivirus1 (envelope-from , uid 501) with qmail-scanner-2.08 (clamdscan: 0.97.3/14187. Clear:RC:1(127.0.0.1):. Processed in 0.022124 secs); 25 Dec 2011 01:58:10 -0000 Received: from unknown (HELO antivirus1) (127.0.0.1) by us.es with SMTP; 25 Dec 2011 01:58:10 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus1 (F-Secure/fsigk_smtp/406/antivirus1); Sun, 25 Dec 2011 02:58:10 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/406/antivirus1) Received: (qmail 27379 invoked from network); 25 Dec 2011 02:58:10 +0100 Received: from 166.220.222.87.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@87.222.220.166) by us.es with SMTP; 25 Dec 2011 02:58:10 +0100 From: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 15/19] netfilter: nf_nat: remove obsolete check in nf_nat_mangle_udp_packet() Date: Sun, 25 Dec 2011 02:57:31 +0100 Message-Id: <1324778255-2830-16-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1324778255-2830-1-git-send-email-pablo@netfilter.org> References: <1324778255-2830-1-git-send-email-pablo@netfilter.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Patrick McHardy The packet size check originates from a time when UDP helpers could accidentally mangle incorrect packets (NEWNAT) and is unnecessary nowadays since the conntrack helpers invoke the NAT helpers for the proper packet directly. Signed-off-by: Patrick McHardy Signed-off-by: Pablo Neira Ayuso --- net/ipv4/netfilter/nf_nat_helper.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/net/ipv4/netfilter/nf_nat_helper.c b/net/ipv4/netfilter/nf_nat_helper.c index 049e8b7..af65958 100644 --- a/net/ipv4/netfilter/nf_nat_helper.c +++ b/net/ipv4/netfilter/nf_nat_helper.c @@ -253,12 +253,6 @@ nf_nat_mangle_udp_packet(struct sk_buff *skb, struct udphdr *udph; int datalen, oldlen; - /* UDP helpers might accidentally mangle the wrong packet */ - iph = ip_hdr(skb); - if (skb->len < iph->ihl*4 + sizeof(*udph) + - match_offset + match_len) - return 0; - if (!skb_make_writable(skb, skb->len)) return 0;