From patchwork Wed Sep 16 15:43:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 518464 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 5F076140180 for ; Thu, 17 Sep 2015 01:51:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753580AbbIPPu7 (ORCPT ); Wed, 16 Sep 2015 11:50:59 -0400 Received: from svenfoo.org ([82.94.215.22]:47604 "EHLO mail.zonque.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753185AbbIPPu4 (ORCPT ); Wed, 16 Sep 2015 11:50:56 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.zonque.de (Postfix) with ESMTP id 5AC53C0130; Wed, 16 Sep 2015 17:43:09 +0200 (CEST) Received: from mail.zonque.de ([127.0.0.1]) by localhost (rambrand.bugwerft.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gup62pwVxm-s; Wed, 16 Sep 2015 17:43:09 +0200 (CEST) Received: from cacofonix.fritz.box (p54AF492D.dip0.t-ipconnect.de [84.175.73.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.zonque.de (Postfix) with ESMTPSA id E3660BC851; Wed, 16 Sep 2015 17:43:08 +0200 (CEST) From: Daniel Mack To: pablo@netfilter.org Cc: daniel@iogearbox.net, netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, fw@strlen.de, balazs.scheidler@balabit.com, Daniel Mack Subject: [PATCH RFC 3/3] net: tcp_ipv4: re-run netfilter chains for marked skbs Date: Wed, 16 Sep 2015 17:43:00 +0200 Message-Id: <1442418180-14322-4-git-send-email-daniel@zonque.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1442418180-14322-1-git-send-email-daniel@zonque.org> References: <1442418180-14322-1-git-send-email-daniel@zonque.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When an skb has been marked for later re-iteration through netfilter, do that after __inet_lookup_skb() has been called. This allows packets sent to unconnected sockets to be filtered reliably. Note that this will never happen for subsequent packets in the same stream, as skb->sk will be set due to early demux, and hence skb->nf_postponed will remain 0. Signed-off-by: Daniel Mack --- net/ipv4/tcp_ipv4.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 93898e0..61e0cb4 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -78,6 +78,7 @@ #include #include +#include #include #include #include @@ -1594,6 +1595,15 @@ int tcp_v4_rcv(struct sk_buff *skb) if (!sk) goto no_tcp_socket; + if (unlikely(skb->nf_postponed)) { + ret = nf_hook(NFPROTO_IPV4, NF_INET_LOCAL_IN, sk, + skb, skb->dev, NULL, NULL); + if (ret != 1) { + sock_put(sk); + return 0; + } + } + process: if (sk->sk_state == TCP_TIME_WAIT) goto do_time_wait;