Messages in this thread Patch in this message | | | From | Chris Metcalf <> | Date | Tue, 23 Jul 2013 16:05:48 -0400 | Subject | [PATCH 03/13] tile: avoid bug in tilepro net driver built with old hypervisor |
| |
Building against headers from an older Tilera hypervisor can cause the frags[] array to be overrun. Don't enable TSO in that case.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> --- drivers/net/ethernet/tile/tilepro.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c index 84a179e..dd3a39c 100644 --- a/drivers/net/ethernet/tile/tilepro.c +++ b/drivers/net/ethernet/tile/tilepro.c @@ -1927,7 +1927,7 @@ static int tile_net_tx(struct sk_buff *skb, struct net_device *dev) unsigned int csum_start = skb_checksum_start_offset(skb); - lepp_frag_t frags[LEPP_MAX_FRAGS]; + lepp_frag_t frags[1 + MAX_SKB_FRAGS]; unsigned int num_frags; @@ -1942,7 +1942,7 @@ static int tile_net_tx(struct sk_buff *skb, struct net_device *dev) unsigned int cmd_head, cmd_tail, cmd_next; unsigned int comp_tail; - lepp_cmd_t cmds[LEPP_MAX_FRAGS]; + lepp_cmd_t cmds[1 + MAX_SKB_FRAGS]; /* @@ -2309,8 +2309,9 @@ static void tile_net_setup(struct net_device *dev) /* We support scatter/gather. */ dev->features |= NETIF_F_SG; - /* We support TSO. */ - dev->features |= NETIF_F_TSO; + /* We support TSO iff the HV supports sufficient frags. */ + if (LEPP_MAX_FRAGS >= 1 + MAX_SKB_FRAGS) + dev->features |= NETIF_F_TSO; #ifdef TILE_NET_GSO /* We support GSO. */ -- 1.8.3.1
| |