diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-10 13:30:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-10 13:30:33 -0700 |
| commit | d88210910a34b3b5da71e13fc53859516104e232 (patch) | |
| tree | dc8d9bd32c783edcb769de075f2af184409ad6f1 /net/can | |
| parent | 40edeff6e1c6f9a6f16536ae3375e3af9d648449 (diff) | |
| parent | a8241c63517ec0b900695daa9003cddc41c536a1 (diff) | |
| download | talos-obmc-linux-d88210910a34b3b5da71e13fc53859516104e232.tar.gz talos-obmc-linux-d88210910a34b3b5da71e13fc53859516104e232.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
The following patchset contains four fixes for Netfilter and one fix
for IPVS, they are:
* Fix data leak to user-space via getsockopt IP_VS_SO_GET_DESTS, from
Dan Carpenter.
* Fix xt_TCPMSS if no TCP MSS is specified in syn packets, to avoid the
violation of RFC879, from Phil Oester.
* Fix incomplete dump of objects via nfnetlink_acct and nfnetlink_cttimeout,
from myself.
* Fix missing HW protocol in packets passed to user-space via NFQUEUE,
from myself.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions
