From patchwork Thu May 22 18:57:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart De Schuymer X-Patchwork-Id: 351586 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 8F679140086 for ; Fri, 23 May 2014 04:57:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751423AbaEVS5R (ORCPT ); Thu, 22 May 2014 14:57:17 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:39642 "EHLO andre.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750890AbaEVS5O (ORCPT ); Thu, 22 May 2014 14:57:14 -0400 Received: from [192.168.0.185] ([78.22.122.115]) by andre.telenet-ops.be with bizsmtp id 56xD1o00X2VVMNN016xDUK; Thu, 22 May 2014 20:57:13 +0200 Message-ID: <537E4889.5000306@pandora.be> Date: Thu, 22 May 2014 20:57:13 +0200 From: Bart De Schuymer User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: David Miller CC: davidn@davidnewall.com, fw@strlen.de, stephen@networkplumber.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, bridge@lists.linux-foundation.org Subject: Re: Revert 462fb2af9788a82a534f8184abfde31574e1cfa0 (bridge : Sanitize skb before it enters the IP stack) References: <537A6E5C.6090602@pandora.be> <537C5A6C.3030809@davidnewall.com> <537CF5A2.3080401@pandora.be> <20140521.161841.1806439174351824310.davem@davemloft.net> In-Reply-To: <20140521.161841.1806439174351824310.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org David Miller schreef op 21/05/2014 22:18: > From: Bart De Schuymer >> There's no reason why they should overlap in the cb: it's 48 bytes >> big, so big enough to hold both struct br_input_skb_cb and struct >> inet_skb_parm. The original problem was introduced when >> BR_INPUT_SKB_CB was introduced (around Feb 27, 2010), so fixing >> BR_INPUT_SKB_CB seems most appropriate to me. > > So you are suggesting the patch below will fix everything? Assuming: - David Newall's worries about IPCB are incorrect - you also revert the commit mentioned by David (462fb2af9788a82a534f8184abfde31574e1cfa0 (bridge : Sanitize skb before it enters the IP stack)) Then I give it a good chance the regression will be gone with your patch. > We never should have added bridging netfilter to the tree in the > first place, I wish I had better judgment back then. Feel free to deprecate it. This is my last spare-time involvement. Please apply following patch: --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/MAINTAINERS b/MAINTAINERS index f5de16e..2369bae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3163,10 +3163,9 @@ S: Maintained F: drivers/scsi/eata_pio.* EBTABLES -M: Bart De Schuymer L: netfilter-devel@vger.kernel.org W: http://ebtables.sourceforge.net/ -S: Maintained +S: Orphan F: include/linux/netfilter_bridge/ebt_*.h F: include/uapi/linux/netfilter_bridge/ebt_*.h F: net/bridge/netfilter/ebt*.c