From mboxrd@z Thu Jan 1 00:00:00 1970 From: 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> Cc: netdev@vger.kernel.org, Neil Brown , Miklos Szeredi , Wouter Verhelst , Peter Zijlstra , trond.myklebust@fys.uio.no, Suresh Jayaraman To: Linus Torvalds , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org Return-path: Sender: owner-linux-mm@kvack.org List-Id: netdev.vger.kernel.org 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, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org