diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2017-10-20 15:59:30 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-10-23 05:28:40 +0100 |
| commit | e83b171568e6a69cff5eb592907b71e480b535ac (patch) | |
| tree | ddac2e83934fb6850e25b5e48effd37892edccf0 | |
| parent | Merge branch 'mlxsw-Add-support-for-non-equal-cost-multi-path' (diff) | |
| download | linux-dev-e83b171568e6a69cff5eb592907b71e480b535ac.tar.xz linux-dev-e83b171568e6a69cff5eb592907b71e480b535ac.zip | |
net: systemport: Guard against unmapped TX ring
Because SYSTEMPORT is a (semi) normal network device, the stack may attempt to
queue packets on it oustide of the DSA slave transmit path. When that happens,
the DSA layer has not had a chance to tag packets with the appropriate per-port
and per-queue information, and if that happens and we don't have a port 0 queue
0 available (e.g: on boards where this does not exist), we will hit a NULL
pointer de-reference in bcm_sysport_select_queue().
Guard against such cases by testing for the TX ring validity.
Fixes: 84ff33eeb23d ("net: systemport: Establish DSA network device queue mapping")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index dafc26690555..1d9d5f986e14 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -2040,6 +2040,9 @@ static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb, port = BRCM_TAG_GET_PORT(queue); tx_ring = priv->ring_map[q + port * priv->per_port_num_tx_queues]; + if (unlikely(!tx_ring)) + return fallback(dev, skb); + return tx_ring->index; } |