From patchwork Sat Dec 28 22:02:59 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: 305604 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 C46792C00BE for ; Sun, 29 Dec 2013 09:03:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751384Ab3L1WDW (ORCPT ); Sat, 28 Dec 2013 17:03:22 -0500 Received: from mail.us.es ([193.147.175.20]:43852 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751363Ab3L1WDV (ORCPT ); Sat, 28 Dec 2013 17:03:21 -0500 Received: (qmail 20034 invoked from network); 28 Dec 2013 23:03:20 +0100 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 28 Dec 2013 23:03:20 +0100 Received: (qmail 6610 invoked by uid 507); 28 Dec 2013 22:03:20 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98/18298. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-99.8/7.5):. Processed in 1.951089 secs); 28 Dec 2013 22:03:20 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-99.8 required=7.5 tests=BAYES_50,RCVD_IN_PBL, RCVD_IN_RP_RNBL, RCVD_IN_SORBS_DUL, RDNS_DYNAMIC, SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Spam-ASN: AS12715 95.20.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 28 Dec 2013 22:03:18 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/412/antivirus2); Sat, 28 Dec 2013 23:03:18 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus2) Received: (qmail 17047 invoked from network); 28 Dec 2013 23:03:17 +0100 Received: from 108.60.20.95.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@95.20.60.108) by mail.us.es with SMTP; 28 Dec 2013 23:03:17 +0100 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 0/8] Netfilter/IPVS fixes for net Date: Sat, 28 Dec 2013 23:02:59 +0100 Message-Id: <1388268187-11569-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, This patchset contains four nf_tables fixes, one IPVS fix due to missing updates in the interaction with the new sedadj conntrack extension that was added to support the netfilter synproxy code, and a couple of one-liners to fix netnamespace netfilter issues. More specifically, they are: * Fix ipv6_find_hdr() call without offset being explicitly initialized in nft_exthdr, as required by that function, from Daniel Borkmann. * Fix oops in nfnetlink_log when using netns and unloading the kernel module, from Gao feng. * Fix BUG_ON in nf_ct_timestamp extension after netns is destroyed, from Helmut Schaa. * Fix crash in IPVS due to missing sequence adjustment extension being allocated in the conntrack, from Jesper Dangaard Brouer. * Add bugtrap to spot a warning in case you deference sequence adjustment conntrack area when not available, this should help to catch similar invalid dereferences in the Netfilter tree, also from Jesper. * Fix incomple dumping of sets in nf_tables when retrieving by family, from me. * Fix oops when updating the table state (dormant <-> active) and having user (not base ) chains, from me. * Fix wrong validation in set element data that results in returning -EINVAL when using the nf_tables dictionary feature with mappings, also from me. We don't usually have this amount of fixes by this time (as we're already in -rc5 of the development cycle), although half of them are related to nf_tables which is a relatively new thing, and I also belive that holidays have also delayed the flight of bugfixes to mainstream a bit. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master Thanks! P.S: Have a nice entrance to new year. ---------------------------------------------------------------- The following changes since commit a7c12639bdf571a09578aed626875848d209d24f: Merge branch 'qlcnic' (2013-12-17 16:25:24 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master for you to fetch changes up to 2ee0d3c80fdb7974cfa1c7e25b5048e9fcaf69b6: netfilter: nf_tables: fix wrong datatype in nft_validate_data_load() (2013-12-28 22:32:28 +0100) ---------------------------------------------------------------- Daniel Borkmann (1): netfilter: nft_exthdr: call ipv6_find_hdr() with explicitly initialized offset Gao feng (1): netfilter: nfnetlink_log: unset nf_loggers for netns when unloading module Helmut Schaa (1): netfilter: nf_ct_timestamp: Fix BUG_ON after netns deletion Jesper Dangaard Brouer (2): netfilter: WARN about wrong usage of sequence number adjustments ipvs: correct usage/allocation of seqadj ext in ipvs Pablo Neira Ayuso (3): netfilter: nf_tables: fix dumping with large number of sets netfilter: nf_tables: fix oops when updating table with user chains netfilter: nf_tables: fix wrong datatype in nft_validate_data_load() net/netfilter/ipvs/ip_vs_nfct.c | 6 ++++++ net/netfilter/nf_conntrack_seqadj.c | 5 +++++ net/netfilter/nf_conntrack_timestamp.c | 1 - net/netfilter/nf_tables_api.c | 26 ++++++++++++++++++++------ net/netfilter/nfnetlink_log.c | 1 + net/netfilter/nft_exthdr.c | 2 +- 6 files changed, 33 insertions(+), 8 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