diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-02 11:29:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-02 11:29:31 -0800 |
| commit | 88d2d28b182dc3f38e68259efaa6dd3bc40ef1e6 (patch) | |
| tree | 285bb300f799a11bdf7db664d0d2517a9bd89ece /net | |
| parent | 720dc34bbbe9493c7bd48b2243058b4e447a929d (diff) | |
| parent | 9ef0298a8e5730d9a46d640014c727f3b4152870 (diff) | |
| download | linux-88d2d28b182dc3f38e68259efaa6dd3bc40ef1e6.tar.gz linux-88d2d28b182dc3f38e68259efaa6dd3bc40ef1e6.tar.bz2 linux-88d2d28b182dc3f38e68259efaa6dd3bc40ef1e6.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 4 | ||||
| -rw-r--r-- | net/netfilter/nf_log.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 22f7ad5101ab..ba98e1308f3c 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -808,9 +808,9 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest, dest->u_threshold = udest->u_threshold; dest->l_threshold = udest->l_threshold; - spin_lock(&dest->dst_lock); + spin_lock_bh(&dest->dst_lock); ip_vs_dst_reset(dest); - spin_unlock(&dest->dst_lock); + spin_unlock_bh(&dest->dst_lock); if (add) ip_vs_new_estimator(&dest->stats); diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index b07393eab88e..91816998ed86 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c @@ -85,6 +85,8 @@ EXPORT_SYMBOL(nf_log_unregister); int nf_log_bind_pf(u_int8_t pf, const struct nf_logger *logger) { + if (pf >= ARRAY_SIZE(nf_loggers)) + return -EINVAL; mutex_lock(&nf_log_mutex); if (__find_logger(pf, logger->name) == NULL) { mutex_unlock(&nf_log_mutex); @@ -98,6 +100,8 @@ EXPORT_SYMBOL(nf_log_bind_pf); void nf_log_unbind_pf(u_int8_t pf) { + if (pf >= ARRAY_SIZE(nf_loggers)) + return; mutex_lock(&nf_log_mutex); rcu_assign_pointer(nf_loggers[pf], NULL); mutex_unlock(&nf_log_mutex); |