From patchwork Fri Apr 19 01:23:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 237789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 386A42C01E5 for ; Fri, 19 Apr 2013 11:24:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967576Ab3DSBYK (ORCPT ); Thu, 18 Apr 2013 21:24:10 -0400 Received: from mail.us.es ([193.147.175.20]:57201 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967266Ab3DSBYJ (ORCPT ); Thu, 18 Apr 2013 21:24:09 -0400 Received: (qmail 20715 invoked from network); 19 Apr 2013 03:24:07 +0200 Received: from unknown (HELO us.es) (192.168.2.11) by us.es with SMTP; 19 Apr 2013 03:24:07 +0200 Received: (qmail 4348 invoked by uid 507); 19 Apr 2013 01:24:07 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus1 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.7/17039. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-97.8/7.5):. Processed in 1.894828 secs); 19 Apr 2013 01:24:07 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus1 X-Spam-Level: X-Spam-Status: No, score=-97.8 required=7.5 tests=BAYES_50,RCVD_IN_PBL, RCVD_IN_RP_RNBL,RDNS_DYNAMIC,USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus1) (127.0.0.1) by us.es with SMTP; 19 Apr 2013 01:24:05 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus1 (F-Secure/fsigk_smtp/407/antivirus1); Fri, 19 Apr 2013 03:24:05 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus1) Received: (qmail 11401 invoked from network); 19 Apr 2013 03:24:05 +0200 Received: from 205.60.20.95.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@95.20.60.205) by us.es with SMTP; 19 Apr 2013 03:24:05 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 0/5] Netfilter updates for net-next Date: Fri, 19 Apr 2013 03:23:52 +0200 Message-Id: <1366334638-5113-1-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Hi David, The following patchset contains a small batch of Netfilter updates for your net-next tree, they are: * Three patches that provide more accurate error reporting to user-space, instead of -EPERM, in IPv4/IPv6 netfilter re-routing code and NAT, from Patrick McHardy. * Update copyright statements in Netfilter filters of Patrick McHardy, from himself. * Add Kconfig dependency on the raw/mangle tables to the rpfilter, from Florian Westphal. The following changes since commit 6b0ee8c036ecb3ac92e18e6ca0dca7bff88beaf0: scm: Stop passing struct cred (2013-04-07 18:58:55 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git master for you to fetch changes up to d37d696804a83479f240b397670a07ccb53a7417: netfilter: xt_rpfilter: depend on raw or mangle table (2013-04-19 00:22:55 +0200) ---------------------------------------------------------------- Florian Westphal (1): netfilter: xt_rpfilter: depend on raw or mangle table Patrick McHardy (4): netfilter: ipv4: propagate routing errors from ip_route_me_harder() netfilter: ipv6: propagate routing errors from ip6_route_me_harder() netfilter: nat: propagate errors from xfrm_me_harder() netfilter: add my copyright statements net/ipv4/netfilter.c | 15 ++++++++----- net/ipv4/netfilter/Kconfig | 2 +- net/ipv4/netfilter/arp_tables.c | 1 + net/ipv4/netfilter/ip_tables.c | 1 + net/ipv4/netfilter/ipt_ULOG.c | 1 + net/ipv4/netfilter/iptable_mangle.c | 9 +++++--- net/ipv4/netfilter/iptable_nat.c | 23 +++++++++++++------- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 1 + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 1 + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 1 + net/ipv4/netfilter/nf_nat_h323.c | 1 + net/ipv4/netfilter/nf_nat_pptp.c | 2 ++ net/ipv4/netfilter/nf_nat_proto_gre.c | 2 ++ net/ipv4/netfilter/nf_nat_snmp_basic.c | 2 ++ net/ipv6/netfilter.c | 12 +++++++--- net/ipv6/netfilter/Kconfig | 2 +- net/ipv6/netfilter/ip6_tables.c | 1 + net/ipv6/netfilter/ip6t_REJECT.c | 2 ++ net/ipv6/netfilter/ip6table_mangle.c | 9 +++++--- net/ipv6/netfilter/ip6table_nat.c | 23 +++++++++++++------- net/netfilter/core.c | 1 + net/netfilter/nf_conntrack_amanda.c | 1 + net/netfilter/nf_conntrack_core.c | 1 + net/netfilter/nf_conntrack_ecache.c | 8 ++++--- net/netfilter/nf_conntrack_expect.c | 1 + net/netfilter/nf_conntrack_ftp.c | 1 + net/netfilter/nf_conntrack_h323_main.c | 1 + net/netfilter/nf_conntrack_helper.c | 1 + net/netfilter/nf_conntrack_irc.c | 1 + net/netfilter/nf_conntrack_pptp.c | 2 ++ net/netfilter/nf_conntrack_proto.c | 1 + net/netfilter/nf_conntrack_proto_gre.c | 1 + net/netfilter/nf_conntrack_proto_sctp.c | 3 +++ net/netfilter/nf_conntrack_proto_tcp.c | 2 ++ net/netfilter/nf_conntrack_proto_udp.c | 1 + net/netfilter/nf_conntrack_standalone.c | 1 + net/netfilter/nf_conntrack_tftp.c | 2 +- net/netfilter/nf_nat_amanda.c | 1 + net/netfilter/nf_nat_core.c | 9 ++++---- net/netfilter/nf_nat_helper.c | 1 + net/netfilter/nf_queue.c | 5 +++++ net/netfilter/nfnetlink_log.c | 1 + net/netfilter/x_tables.c | 1 + net/netfilter/xt_TCPMSS.c | 1 + net/netfilter/xt_conntrack.c | 1 + net/netfilter/xt_hashlimit.c | 1 + net/netfilter/xt_limit.c | 1 + 47 files changed, 122 insertions(+), 40 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html