Commit 7be2c82c authored Jan 18, 2017 by Eric Dumazet Committed by David S. Miller Jan 18, 2017

net: fix harmonize_features() vs NETIF_F_HIGHDMA



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: ec5f0615 ("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>

parent d89ede6d

net/core/dev.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2795,9 +2795,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_CSUM_MASK \| NETIF_F_GSO_MASK);
		} else if (illegal_highdma(skb->dev, skb)) {
		features &= ~NETIF_F_SG;
		}
		if (illegal_highdma(skb->dev, skb))
		features &= ~NETIF_F_SG;

		return features;
		}

Admin message