aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHarald Welte <laforge@netfilter.org>2005-08-09 23:23:53 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 18:51:25 -0400
commit8a61fadb3908454ccfa538aaa75eb1d22def5700 (patch)
treee3e2b131c03b3cab2f81e6cdeeaadf50071046b9 /net
parentd72367b6f36e557f122beefaa8c6b80eb1c7f245 (diff)
[NETFILTER]: check nf_log function call arguments
Check whether pf is too large in order to prevent array overflow. Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_log.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index e104760f7a67..573e76a770d9 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -24,6 +24,9 @@ int nf_log_register(int pf, struct nf_logger *logger)
24{ 24{
25 int ret = -EBUSY; 25 int ret = -EBUSY;
26 26
27 if (pf >= NPROTO)
28 return -EINVAL;
29
27 /* Any setup of logging members must be done before 30 /* Any setup of logging members must be done before
28 * substituting pointer. */ 31 * substituting pointer. */
29 spin_lock(&nf_log_lock); 32 spin_lock(&nf_log_lock);
@@ -38,14 +41,19 @@ int nf_log_register(int pf, struct nf_logger *logger)
38} 41}
39EXPORT_SYMBOL(nf_log_register); 42EXPORT_SYMBOL(nf_log_register);
40 43
41void nf_log_unregister_pf(int pf) 44int nf_log_unregister_pf(int pf)
42{ 45{
46 if (pf >= NPROTO)
47 return -EINVAL;
48
43 spin_lock(&nf_log_lock); 49 spin_lock(&nf_log_lock);
44 nf_logging[pf] = NULL; 50 nf_logging[pf] = NULL;
45 spin_unlock(&nf_log_lock); 51 spin_unlock(&nf_log_lock);
46 52
47 /* Give time to concurrent readers. */ 53 /* Give time to concurrent readers. */
48 synchronize_net(); 54 synchronize_net();
55
56 return 0;
49} 57}
50EXPORT_SYMBOL(nf_log_unregister_pf); 58EXPORT_SYMBOL(nf_log_unregister_pf);
51 59