From mboxrd@z Thu Jan 1 00:00:00 1970 Message-Id: <20070221144843.299254000@taijtu.programming.kicks-ass.net> References: <20070221144304.512721000@taijtu.programming.kicks-ass.net> Date: Wed, 21 Feb 2007 15:43:22 +0100 From: Peter Zijlstra Subject: [PATCH 18/29] netfilter: notify about NF_QUEUE vs emergency skbs Content-Disposition: inline; filename=emergency-nf_queue.patch Sender: owner-linux-mm@kvack.org Return-Path: To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org Cc: Peter Zijlstra , Trond Myklebust , Thomas Graf , David Miller List-ID: Emergency skbs should never touch user-space, however NF_QUEUE is fully user configurable. Notify the user of his mistake and try to continue. Signed-off-by: Peter Zijlstra --- net/netfilter/core.c | 5 +++++ 1 file changed, 5 insertions(+) Index: linux-2.6-git/net/netfilter/core.c =================================================================== --- linux-2.6-git.orig/net/netfilter/core.c 2007-02-14 12:09:07.000000000 +0100 +++ linux-2.6-git/net/netfilter/core.c 2007-02-14 12:09:18.000000000 +0100 @@ -187,6 +187,11 @@ next_hook: kfree_skb(*pskb); ret = -EPERM; } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) { + if (unlikely((*pskb)->emergency)) { + printk(KERN_ERR "nf_hook: NF_QUEUE encountered for " + "emergency skb - skipping rule.\n"); + goto next_hook; + } NFDEBUG("nf_hook: Verdict = QUEUE.\n"); if (!nf_queue(*pskb, elem, pf, hook, indev, outdev, okfn, verdict >> NF_VERDICT_BITS)) -- -- 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