Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932543AbZJAOHo (ORCPT ); Thu, 1 Oct 2009 10:07:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932461AbZJAOHk (ORCPT ); Thu, 1 Oct 2009 10:07:40 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:51937 "EHLO victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932459AbZJAOHi (ORCPT ); Thu, 1 Oct 2009 10:07:38 -0400 From: Suresh Jayaraman To: Linus Torvalds , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: netdev@vger.kernel.org, Neil Brown , Miklos Szeredi , Wouter Verhelst , Peter Zijlstra , trond.myklebust@fys.uio.no, Suresh Jayaraman Subject: [PATCH 21/31] netfilter: NF_QUEUE vs emergency skbs Date: Thu, 1 Oct 2009 19:38:49 +0530 Message-Id: <1254406129-16409-1-git-send-email-sjayaraman@suse.de> X-Mailer: git-send-email 1.6.0.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1198 Lines: 34 From: Peter Zijlstra Avoid memory getting stuck waiting for userspace, drop all emergency packets. This of course requires the regular storage route to not include an NF_QUEUE target ;-) Signed-off-by: Peter Zijlstra Signed-off-by: Suresh Jayaraman --- net/netfilter/core.c | 3 +++ 1 file changed, 3 insertions(+) Index: mmotm/net/netfilter/core.c =================================================================== --- mmotm.orig/net/netfilter/core.c +++ mmotm/net/netfilter/core.c @@ -175,9 +175,12 @@ next_hook: if (verdict == NF_ACCEPT || verdict == NF_STOP) { ret = 1; } else if (verdict == NF_DROP) { +drop: kfree_skb(skb); ret = -EPERM; } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) { + if (skb_emergency(skb)) + goto drop; if (!nf_queue(skb, elem, pf, hook, indev, outdev, okfn, verdict >> NF_VERDICT_BITS)) goto next_hook; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/