diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-01-08 15:04:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-08 15:04:56 -0500 |
| commit | 54b553e2c16001d13e0186cad2531764065f9a1b (patch) | |
| tree | a43c673e5e5aeaa87ba86f334b069453e9374569 /net/openvswitch | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (diff) | |
| parent | netfilter: nf_conntrack_dccp: fix skb_header_pointer API usages (diff) | |
| download | linux-dev-54b553e2c16001d13e0186cad2531764065f9a1b.tar.xz linux-dev-54b553e2c16001d13e0186cad2531764065f9a1b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains three Netfilter updates, they are:
* Fix wrong usage of skb_header_pointer in the DCCP protocol helper that
has been there for quite some time. It was resulting in copying the dccp
header to a pointer allocated in the stack. Fortunately, this pointer
provides room for the dccp header is 4 bytes long, so no crashes have been
reported so far. From Daniel Borkmann.
* Use format string to print in the invocation of nf_log_packet(), again
in the DCCP helper. Also from Daniel Borkmann.
* Revert "netfilter: avoid get_random_bytes call" as prandom32 does not
guarantee enough entropy when being calling this at boot time, that may
happen when reloading the rule.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
0 files changed, 0 insertions, 0 deletions