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 /include/net | |
| 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 'include/net')
| -rw-r--r-- | include/net/tcp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index c9766f89deba..4062b4f0d121 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -730,6 +730,7 @@ struct tcp_skb_cb { #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0])) +#if IS_ENABLED(CONFIG_IPV6) /* This is the variant of inet6_iif() that must be used by TCP, * as TCP moves IP6CB into a different location in skb->cb[] */ @@ -737,6 +738,7 @@ static inline int tcp_v6_iif(const struct sk_buff *skb) { return TCP_SKB_CB(skb)->header.h6.iif; } +#endif /* Due to TSO, an SKB can be composed of multiple actual * packets. To keep these tracked properly, we use this. |