diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-22 15:27:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-22 15:27:18 -0500 |
| commit | 84ec95b047d2d02552f07c06d9d6da8b61532090 (patch) | |
| tree | 3fc7861a6a2d1ad22722bb905bd3731623463f0f /net/ipv4 | |
| parent | 5e7873d1450e1809b017b943417530db3955ac5f (diff) | |
| parent | e93b5f9f320db431ec8623a4c667811007e07fd7 (diff) | |
| download | op-kernel-dev-84ec95b047d2d02552f07c06d9d6da8b61532090.zip op-kernel-dev-84ec95b047d2d02552f07c06d9d6da8b61532090.tar.gz | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says:
====================
The following patchset contains two Netfilter fixes:
* Fix buffer overflow in the name of the timeout policy object
in the cttimeout infrastructure, from Florian Westphal.
* Fix a bug in the hash set in case that IP ranges are
specified, from Jozsef Kadlecsik.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions
