diff options
author | Eric Dumazet <edumazet@google.com> | 2017-01-18 12:12:17 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-04 09:45:09 +0100 |
commit | 6fec199362c4d94e551d18edb9c5ad1ef83fea1d (patch) | |
tree | 401ad16b011120a4ee8af3096d1a1d1419549b3b /net/core | |
parent | 4f5e54bdd052cb7b6f754d6e4ced0367b11af3ed (diff) | |
download | linux-stable-6fec199362c4d94e551d18edb9c5ad1ef83fea1d.tar.gz linux-stable-6fec199362c4d94e551d18edb9c5ad1ef83fea1d.tar.bz2 linux-stable-6fec199362c4d94e551d18edb9c5ad1ef83fea1d.zip |
net: fix harmonize_features() vs NETIF_F_HIGHDMA
[ Upstream commit 7be2c82cfd5d28d7adb66821a992604eb6dd112e ]
Ashizuka reported a highmem oddity and sent a patch for freescale
fec driver.
But the problem root cause is that core networking stack
must ensure no skb with highmem fragment is ever sent through
a device that does not assert NETIF_F_HIGHDMA in its features.
We need to call illegal_highdma() from harmonize_features()
regardless of CSUM checks.
Fixes: ec5f06156423 ("net: Kill link between CSUM and SG features.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Pravin Shelar <pshelar@ovn.org>
Reported-by: "Ashizuka, Yuusuke" <ashiduka@jp.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 6f203c7fb166..0798a0f1b395 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2650,9 +2650,9 @@ static netdev_features_t harmonize_features(struct sk_buff *skb, if (skb->ip_summed != CHECKSUM_NONE && !can_checksum_protocol(features, type)) { features &= ~NETIF_F_ALL_CSUM; - } else if (illegal_highdma(skb->dev, skb)) { - features &= ~NETIF_F_SG; } + if (illegal_highdma(skb->dev, skb)) + features &= ~NETIF_F_SG; return features; } |