From patchwork Mon Jul 22 08:34:35 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: 260601 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 879AC2C00E7 for ; Mon, 22 Jul 2013 18:34:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756738Ab3GVIex (ORCPT ); Mon, 22 Jul 2013 04:34:53 -0400 Received: from mail.us.es ([193.147.175.20]:48044 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756701Ab3GVIew (ORCPT ); Mon, 22 Jul 2013 04:34:52 -0400 Received: (qmail 18361 invoked from network); 22 Jul 2013 10:34:49 +0200 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 22 Jul 2013 10:34:49 +0200 Received: (qmail 30204 invoked by uid 507); 22 Jul 2013 08:34:49 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.8/17549. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-97.8/7.5):. Processed in 1.851811 secs); 22 Jul 2013 08:34:49 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus2 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 antivirus2) (127.0.0.1) by us.es with SMTP; 22 Jul 2013 08:34:47 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/410/antivirus2); Mon, 22 Jul 2013 10:34:47 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/410/antivirus2) Received: (qmail 2936 invoked from network); 22 Jul 2013 10:34:47 +0200 Received: from 198.90.78.188.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@188.78.90.198) by us.es with SMTP; 22 Jul 2013 10:34:47 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 0/2] Netfilter fixes for net (3.11-rc1) Date: Mon, 22 Jul 2013 10:34:35 +0200 Message-Id: <1374482077-4547-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 Netfilter fixes for your net tree, they are: * Fix potential NULL dereference in the socket match if revision 0 is used, from Eric Dumazet. * Fix missing expectation NAT initialization that results in dumping the NAT part via ctnetlink, thus leading to problems in expectation synchronization through conntrackd, from myself. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master Thanks! ---------------------------------------------------------------- The following changes since commit 63345b4794aef4ebe16502cfe35b02bc9822d763: Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 (2013-07-13 18:08:23 -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 baf60efa585c78b269f0097288868a51ccc61f55: netfilter: xt_socket: fix broken v0 support (2013-07-15 11:15:21 +0200) ---------------------------------------------------------------- Eric Dumazet (1): netfilter: xt_socket: fix broken v0 support Pablo Neira Ayuso (1): netfilter: ctnetlink: fix incorrect NAT expectation dumping net/netfilter/nf_conntrack_expect.c | 5 +++++ net/netfilter/xt_socket.c | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) Eric Dumazet (1): netfilter: xt_socket: fix broken v0 support Pablo Neira Ayuso (1): netfilter: ctnetlink: fix incorrect NAT expectation dumping net/netfilter/nf_conntrack_expect.c | 5 +++++ net/netfilter/xt_socket.c | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-)