diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-25 14:06:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-25 14:06:29 -0700 |
| commit | 126a031e437a4ab56a162e9cff7fc04b9f7efeec (patch) | |
| tree | 8fdf2ffd565a0808827665ce74fe65e35647296b /net/netfilter/xt_hashlimit.c | |
| parent | 01e77706cdde7c0b47e5ca1f4284a795504c7c40 (diff) | |
| parent | 7c9f757319ccf7a47ce167b86eda671c87b5b917 (diff) | |
| download | linux-3.10-126a031e437a4ab56a162e9cff7fc04b9f7efeec.tar.gz linux-3.10-126a031e437a4ab56a162e9cff7fc04b9f7efeec.tar.bz2 linux-3.10-126a031e437a4ab56a162e9cff7fc04b9f7efeec.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
TIPC: Removed inactive maintainer
isdn: Cleanup Sections in PCMCIA driver elsa
isdn: Cleanup Sections in PCMCIA driver avma1
isdn: Cleanup Sections in PCMCIA driver teles
isdn: Cleanup Sections in PCMCIA driver sedlbauer
via-velocity: Fix FLOW_CNTL_TX_RX handling in set_mii_flow_control()
netfilter: xt_hashlimit: IPV6 bugfix
netfilter: ip6table_raw: fix table priority
netfilter: xt_hashlimit: dl_seq_stop() fix
af_key: return error if pfkey_xfrm_policy2msg_prep() fails
skbuff: remove unused dma_head & dma_maps fields
vlan: updates vlan real_num_tx_queues
vlan: adds vlan_dev_select_queue
igb: only use vlan_gro_receive if vlans are registered
igb: do not modify tx_queue_len on link speed change
igb: count Rx FIFO errors correctly
bnx2: Use proper handler during netpoll.
bnx2: Fix netpoll crash.
ksz884x: fix return value of netdev_set_eeprom
cgroups: net_cls as module
...
Diffstat (limited to 'net/netfilter/xt_hashlimit.c')
| -rw-r--r-- | net/netfilter/xt_hashlimit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index 9e9c4896394..215a64835de 100644 --- a/net/netfilter/xt_hashlimit.c +++ b/net/netfilter/xt_hashlimit.c @@ -493,6 +493,7 @@ static void hashlimit_ipv6_mask(__be32 *i, unsigned int p) case 64 ... 95: i[2] = maskl(i[2], p - 64); i[3] = 0; + break; case 96 ... 127: i[3] = maskl(i[3], p - 96); break; @@ -879,7 +880,8 @@ static void dl_seq_stop(struct seq_file *s, void *v) struct xt_hashlimit_htable *htable = s->private; unsigned int *bucket = (unsigned int *)v; - kfree(bucket); + if (!IS_ERR(bucket)) + kfree(bucket); spin_unlock_bh(&htable->lock); } |