From 56203e34ec05e39a088036b5d9db7fde7a7af742 Mon Sep 17 00:00:00 2001 From: Camelia Groza Date: Tue, 30 Oct 2018 18:18:30 +0200 Subject: [PATCH] sdk_dpaa: guard against an out of bounds queue index Make sure the queue mapping recorded in the skb is not larger than our egress queue count. Signed-off-by: Camelia Groza --- drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c @@ -1035,7 +1035,7 @@ EXPORT_SYMBOL(skb_to_sg_fd); int __hot dpa_tx(struct sk_buff *skb, struct net_device *net_dev) { struct dpa_priv_s *priv; - const int queue_mapping = dpa_get_queue_mapping(skb); + int queue_mapping = dpa_get_queue_mapping(skb); struct qman_fq *egress_fq, *conf_fq; #ifdef CONFIG_FSL_DPAA_HOOKS @@ -1053,6 +1053,9 @@ int __hot dpa_tx(struct sk_buff *skb, st return ceetm_tx(skb, net_dev); #endif + if (unlikely(queue_mapping >= DPAA_ETH_TX_QUEUES)) + queue_mapping = queue_mapping % DPAA_ETH_TX_QUEUES; + egress_fq = priv->egress_fqs[queue_mapping]; conf_fq = priv->conf_fqs[queue_mapping];