diff options
| author | Harald Welte <laforge@netfilter.org> | 2005-08-09 20:23:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 15:51:25 -0700 |
| commit | 8a61fadb3908454ccfa538aaa75eb1d22def5700 (patch) | |
| tree | e3e2b131c03b3cab2f81e6cdeeaadf50071046b9 | |
| parent | d72367b6f36e557f122beefaa8c6b80eb1c7f245 (diff) | |
| download | kernel_goldelico_gta04-8a61fadb3908454ccfa538aaa75eb1d22def5700.zip kernel_goldelico_gta04-8a61fadb3908454ccfa538aaa75eb1d22def5700.tar.gz kernel_goldelico_gta04-8a61fadb3908454ccfa538aaa75eb1d22def5700.tar.bz2 | |
[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>
| -rw-r--r-- | include/linux/netfilter.h | 2 | ||||
| -rw-r--r-- | net/netfilter/nf_log.c | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index bf430fc..ac3c614 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -157,7 +157,7 @@ struct nf_logger { /* Function to register/unregister log function. */ int nf_log_register(int pf, struct nf_logger *logger); -void nf_log_unregister_pf(int pf); +int nf_log_unregister_pf(int pf); void nf_log_unregister_logger(struct nf_logger *logger); /* Calls the registered backend logging function */ diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index e104760..573e76a 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) { int ret = -EBUSY; + if (pf >= NPROTO) + return -EINVAL; + /* Any setup of logging members must be done before * substituting pointer. */ spin_lock(&nf_log_lock); @@ -38,14 +41,19 @@ int nf_log_register(int pf, struct nf_logger *logger) } EXPORT_SYMBOL(nf_log_register); -void nf_log_unregister_pf(int pf) +int nf_log_unregister_pf(int pf) { + if (pf >= NPROTO) + return -EINVAL; + spin_lock(&nf_log_lock); nf_logging[pf] = NULL; spin_unlock(&nf_log_lock); /* Give time to concurrent readers. */ synchronize_net(); + + return 0; } EXPORT_SYMBOL(nf_log_unregister_pf); |