diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-03 12:39:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-03 12:39:15 -0500 |
| commit | e4485c7484f4ed218aabdb659980b5c1c0ddff29 (patch) | |
| tree | 738365d5e9a0912dc35421e5ce357b6e0e4422c8 /include | |
| parent | bcd1d601e5cc760bf5743a59e4716603490e281c (diff) | |
| parent | b4d1605a8ea608fd7dc45b926a05d75d340bde4b (diff) | |
| download | linux-stable-e4485c7484f4ed218aabdb659980b5c1c0ddff29.tar.gz linux-stable-e4485c7484f4ed218aabdb659980b5c1c0ddff29.tar.bz2 linux-stable-e4485c7484f4ed218aabdb659980b5c1c0ddff29.zip | |
Merge branch 'tcp-cb-selinux-corruption'
Eric Dumazet says:
====================
tcp: add tcp_v4_fill_cb()/tcp_v4_restore_cb()
James Morris reported kernel stack corruption bug that
we tracked back to commit 971f10eca186 ("tcp: better TCP_SKB_CB
layout to reduce cache line misses")
First patch needs to be backported to kernels >= 3.18,
while second patch needs to be backported to kernels >= 4.9, since
this was the time when inet_exact_dif_match appeared.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tcp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 4e09398009c1..6998707e81f3 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -844,12 +844,11 @@ static inline int tcp_v6_sdif(const struct sk_buff *skb) } #endif -/* TCP_SKB_CB reference means this can not be used from early demux */ static inline bool inet_exact_dif_match(struct net *net, struct sk_buff *skb) { #if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV) if (!net->ipv4.sysctl_tcp_l3mdev_accept && - skb && ipv4_l3mdev_skb(TCP_SKB_CB(skb)->header.h4.flags)) + skb && ipv4_l3mdev_skb(IPCB(skb)->flags)) return true; #endif return false; |