]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/blob - src/patches/backports/backports-linux-upstream-2.patch
backports: add upstream driver fixes.
[people/stevee/ipfire-2.x.git] / src / patches / backports / backports-linux-upstream-2.patch
1 From d6b8a68ac7b6d2e241f8d34b769c98a1793d9124 Mon Sep 17 00:00:00 2001
2 From: Ben Hutchings <ben@decadent.org.uk>
3 Date: Wed, 20 Apr 2016 23:23:08 +0100
4 Subject: atl2: Disable unimplemented scatter/gather feature
5
6 [ Upstream commit f43bfaeddc79effbf3d0fcb53ca477cca66f3db8 ]
7
8 atl2 includes NETIF_F_SG in hw_features even though it has no support
9 for non-linear skbs. This bug was originally harmless since the
10 driver does not claim to implement checksum offload and that used to
11 be a requirement for SG.
12
13 Now that SG and checksum offload are independent features, if you
14 explicitly enable SG *and* use one of the rare protocols that can use
15 SG without checkusm offload, this potentially leaks sensitive
16 information (before you notice that it just isn't working). Therefore
17 this obscure bug has been designated CVE-2016-2117.
18
19 Reported-by: Justin Yackoski <jyackoski@crypto-nite.com>
20 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
21 Fixes: ec5f06156423 ("net: Kill link between CSUM and SG features.")
22 Signed-off-by: David S. Miller <davem@davemloft.net>
23 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
24 ---
25 drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28 diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
29 index 265ce1b..96fe542 100644
30 --- a/drivers/net/ethernet/atheros/atlx/atl2.c
31 +++ b/drivers/net/ethernet/atheros/atlx/atl2.c
32 @@ -1413,7 +1413,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
33
34 err = -EIO;
35
36 - netdev->hw_features = NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_RX;
37 + netdev->hw_features = NETIF_F_HW_VLAN_CTAG_RX;
38 netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);
39
40 /* Init PHY as early as possible due to power saving issue */
41 --
42 cgit v0.12
43