From patchwork Fri Apr 12 10:13:15 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: 236008 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 631A12C009F for ; Fri, 12 Apr 2013 20:13:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752528Ab3DLKN1 (ORCPT ); Fri, 12 Apr 2013 06:13:27 -0400 Received: from mail.us.es ([193.147.175.20]:44994 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751132Ab3DLKN1 (ORCPT ); Fri, 12 Apr 2013 06:13:27 -0400 Received: (qmail 3810 invoked from network); 12 Apr 2013 12:13:25 +0200 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 12 Apr 2013 12:13:25 +0200 Received: (qmail 31689 invoked by uid 507); 12 Apr 2013 10:13:25 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.7/16996. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-97.2/7.5):. Processed in 1.780782 secs); 12 Apr 2013 10:13:25 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-97.2 required=7.5 tests=BAYES_50,RCVD_IN_PBL, RCVD_IN_RP_RNBL,RCVD_IN_SORBS_DUL,RDNS_DYNAMIC,USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 12 Apr 2013 10:13:24 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/407/antivirus2); Fri, 12 Apr 2013 12:13:24 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus2) Received: (qmail 4108 invoked from network); 12 Apr 2013 12:13:23 +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; 12 Apr 2013 12:13:23 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 0/4] netfilter fixes for net Date: Fri, 12 Apr 2013 12:13:15 +0200 Message-Id: <1365761599-6990-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 late netfilter fixes for your net tree, they are: * Don't drop segmented TCP packets in the SIP helper, we've got reports from users that this was breaking communications when the SIP phone messages are larger than the MTU, from Patrick McHardy. * Fix refcount leak in the ipset list set, from Jozsef Kadlecsik. * On hash set resizing, the nomatch flag was lost, thus entirely inverting the logic of the set matching, from Jozsef Kadlecsik. * Fix crash on NAT modules removal. Timer expiration may race with the module cleanup exit path while deleting conntracks, from Florian Westphal. The following changes since commit 53f63189b1110559dce8c1ee29e8abc3e31f7630: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2013-04-05 14:04:10 -0700) 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 c2d421e171868586939c328dfb91bab840fe4c49: netfilter: nf_nat: fix race when unloading protocol modules (2013-04-12 11:46:31 +0200) Please, consider pulling this. Thanks! P.S: Jozsef has several updates for net-next that depend on these fixes, could you pull from your net tree into your net-next tree, please? Thanks. ---------------------------------------------------------------- Florian Westphal (1): netfilter: nf_nat: fix race when unloading protocol modules Jozsef Kadlecsik (2): netfilter: ipset: list:set: fix reference counter update netfilter: ipset: hash:*net*: nomatch flag not excluded on set resize Patrick McHardy (1): netfilter: nf_ct_sip: don't drop packets with offsets pointing outside the packet include/linux/netfilter/ipset/ip_set_ahash.h | 30 ++++++++++++++----- net/netfilter/ipset/ip_set_hash_ipportnet.c | 18 ++++++++++++ net/netfilter/ipset/ip_set_hash_net.c | 22 ++++++++++++-- net/netfilter/ipset/ip_set_hash_netiface.c | 22 ++++++++++++-- net/netfilter/ipset/ip_set_hash_netport.c | 18 ++++++++++++ net/netfilter/ipset/ip_set_list_set.c | 10 +++++-- net/netfilter/nf_conntrack_sip.c | 6 ++-- net/netfilter/nf_nat_core.c | 40 +++++--------------------- 8 files changed, 115 insertions(+), 51 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