]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Wed, 23 Oct 2013 20:55:04 +0000 (16:55 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Oct 2013 20:55:04 +0000 (16:55 -0400)
commite65cfd406d262dfc4f249f50781c3c15f1080d38
treee87dec56dd5b20926aa4a35449e1c463d1d2db00
parentef6d91a42471d8f2e7660915f5ec34dc3949da83
parent1bf396478067ca1ff4872c10556fdbde059760fc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
The following patchset contains three netfilter fixes for your net
tree, they are:

* A couple of fixes to resolve info leak to userspace due to uninitialized
  memory area in ulogd, from Mathias Krause.

* Fix instruction ordering issues that may lead to the access of
  uninitialized data in x_tables. The problem involves the table update
 (producer) and the main packet matching (consumer) routines. Detected in
  SMP ARMv7, from Will Deacon.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>