diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-19 20:41:57 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-19 20:41:57 +0200 |
commit | e25b492741373542fb593477547fcf7a6b7d8b04 (patch) | |
tree | 783f0607cf3d962f443f2f27e47e4c194427d595 /net/netrom | |
parent | Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
parent | Net: DSA: Fix checking for get_phy_flags function (diff) | |
download | linux-e25b492741373542fb593477547fcf7a6b7d8b04.tar.xz linux-e25b492741373542fb593477547fcf7a6b7d8b04.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
"A quick batch of bug fixes:
1) Fix build with IPV6 disabled, from Eric Dumazet.
2) Several more cases of caching SKB data pointers across calls to
pskb_may_pull(), thus referencing potentially free'd memory. From
Li RongQing.
3) DSA phy code tests operation presence improperly, instead of going:
if (x->ops->foo)
r = x->ops->foo(args);
it was going:
if (x->ops->foo(args))
r = x->ops->foo(args);
Fix from Andew Lunn"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
Net: DSA: Fix checking for get_phy_flags function
ipv6: fix a potential use after free in sit.c
ipv6: fix a potential use after free in ip6_offload.c
ipv4: fix a potential use after free in gre_offload.c
tcp: fix build error if IPv6 is not enabled
Diffstat (limited to 'net/netrom')
0 files changed, 0 insertions, 0 deletions