[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1337003799-2517-1-git-send-email-alban.crequy@collabora.co.uk>
Date: Mon, 14 May 2012 14:56:34 +0100
From: Alban Crequy <alban.crequy@...labora.co.uk>
To: Pablo Neira Ayuso <pablo@...filter.org>,
Patrick McHardy <kaber@...sh.net>
Cc: Vincent Sanders <vincent.sanders@...labora.co.uk>,
Javier Martinez Canillas <javier.martinez@...labora.co.uk>,
netfilter-devel@...r.kernel.org, netdev@...r.kernel.org,
Alban Crequy <alban.crequy@...labora.co.uk>
Subject: [PATCH 1/6] netfilter: sanity checks on NFPROTO_NUMPROTO
With the NFPROTO_* constants introduced by commit 7e9c6e ("netfilter: Introduce
NFPROTO_* constants"), it is too easy to confuse PF_* and NFPROTO_* constants
in new protocols.
Signed-off-by: Alban Crequy <alban.crequy@...labora.co.uk>
Reviewed-by: Javier Martinez Canillas <javier.martinez@...labora.co.uk>
Reviewed-by: Vincent Sanders <vincent.sanders@...labora.co.uk>
---
net/netfilter/core.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index e1b7e05..4f16552 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -67,6 +67,11 @@ int nf_register_hook(struct nf_hook_ops *reg)
struct nf_hook_ops *elem;
int err;
+ if (reg->pf >= NFPROTO_NUMPROTO || reg->hooknum >= NF_MAX_HOOKS) {
+ BUG();
+ return 1;
+ }
+
err = mutex_lock_interruptible(&nf_hook_mutex);
if (err < 0)
return err;
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists