38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Wed, 20 Apr 2016 23:23:08 +0100
|
|
Subject: atl2: Disable unimplemented scatter/gather feature
|
|
Origin: https://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit?id=f43bfaeddc79effbf3d0fcb53ca477cca66f3db8
|
|
|
|
atl2 includes NETIF_F_SG in hw_features even though it has no support
|
|
for non-linear skbs. This bug was originally harmless since the
|
|
driver does not claim to implement checksum offload and that used to
|
|
be a requirement for SG.
|
|
|
|
Now that SG and checksum offload are independent features, if you
|
|
explicitly enable SG *and* use one of the rare protocols that can use
|
|
SG without checkusm offload, this potentially leaks sensitive
|
|
information (before you notice that it just isn't working). Therefore
|
|
this obscure bug has been designated CVE-2016-2117.
|
|
|
|
Reported-by: Justin Yackoski <jyackoski@crypto-nite.com>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
Fixes: ec5f06156423 ("net: Kill link between CSUM and SG features.")
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
|
|
index 8f76f4558a88..2ff465848b65 100644
|
|
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
|
|
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
|
|
@@ -1412,7 +1412,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
|
err = -EIO;
|
|
|
|
- netdev->hw_features = NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_RX;
|
|
+ netdev->hw_features = NETIF_F_HW_VLAN_CTAG_RX;
|
|
netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);
|
|
|
|
/* Init PHY as early as possible due to power saving issue */
|