| commit | 7bd04bcf91e77bd0fe01c180546aacab4c7934be | |
| author | David S. Miller <davem@davemloft.net> | |
| Mon, 22 Jul 2013 21:32:39 +0000 (22 14:32 -0700) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Mon, 22 Jul 2013 21:32:39 +0000 (22 14:32 -0700) | ||
| tree | ac8a84f1ab026998dfae0f95f0057756cc650681 | treesnapshot (tar.gz zip) |
| parent | f5f7ab6785ec15b8b95750c0dd590ca3aeb49248 | commitdiff |
| parent | baf60efa585c78b269f0097288868a51ccc61f55 | commitdiff |
Merge branch 'master' of git://git./linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
The following patchset contains Netfilter fixes for your net tree,
they are:
* Fix potential NULL dereference in the socket match if revision 0
is used, from Eric Dumazet.
* Fix missing expectation NAT initialization that results in dumping
the NAT part via ctnetlink, thus leading to problems in expectation
synchronization through conntrackd, from myself.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Pablo Neira Ayuso says:
====================
The following patchset contains Netfilter fixes for your net tree,
they are:
* Fix potential NULL dereference in the socket match if revision 0
is used, from Eric Dumazet.
* Fix missing expectation NAT initialization that results in dumping
the NAT part via ctnetlink, thus leading to problems in expectation
synchronization through conntrackd, from myself.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>