From patchwork Fri Oct 20 22:59:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 828837 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vYwXEVsf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yJh8251w6z9t3H for ; Sat, 21 Oct 2017 09:59:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752634AbdJTW7h (ORCPT ); Fri, 20 Oct 2017 18:59:37 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:54324 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752334AbdJTW7g (ORCPT ); Fri, 20 Oct 2017 18:59:36 -0400 Received: by mail-wm0-f66.google.com with SMTP id r68so479448wmr.3 for ; Fri, 20 Oct 2017 15:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3w8BwzrltrMTP+Av8DBymzXEUm5USin2bh6WoBXZ0jc=; b=vYwXEVsfgBiIFQGpR6vCfdF4ZswUtuqcTU/MBF+Xg6HMf8meKhu4zycVmdsYORSS1n YUlHuK8cqEjZXdQQRIlgM11igY04jt7XUQdBqzaXPn9MxPjlVgoaoST5a9NCd0bDE4EH 6ul4I6odFh93zoTXK8Bhf4bLSFY56bX5Zrkg6+tkIQsY2vucfLZOSvFEs6xOCCp2RJXQ UMtxlga4Kr6pwYCVF0ojQnhlv7Sn2ubarwuE3V7xGJ8Y0ZMLYd69sBihf+4qMh6KaG3+ +7Bqua6GEiq/wDvK2hXa5IDAhOLJgB7WoVUvjV1eF3/XbXJIYN+wuPk9BlC9wNY4lvEZ 3Prw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3w8BwzrltrMTP+Av8DBymzXEUm5USin2bh6WoBXZ0jc=; b=BNbV3z7nv9UW12NsRFfqAimJk81VLlRwOk13w9PQRhceGlY3cHxZdB0MMhfOgFUQ8v A0yZ6nogY/M34V+rBza5IEzfcY+A4VTzlzhOKk6ZQbB+lqOuiVfQQRsbsWW1SqFhmb7H zqfkFf9SDtx9ZEw3jzmlxxOZcIudENx5ByvZpGX3GyQRs72bPdmGHAeZav7YVXvbSb/3 PZP6PAd40n3A1LT2WrCsAyGZjoiXsUD8ll/l3aWqQkbuQpqCAJf0c9QNP7R7X4xFnZ5O tbuh74yRScdDy3bz4xvxA358Q+mMqVL7qzH2jZf3eN9p3DCv/JthjS+AIPv6N0U45Jpu JPvw== X-Gm-Message-State: AMCzsaXpGt5O9Tt+YSGZX5WeX9aE1VkKa2m7euWjQTm8vBLgtin1FwKa hhC7m0I3sYn2LoWM7CMLS0iENpjV X-Google-Smtp-Source: ABhQp+RPz0h7Gc1IMm88S3WByaSB1I9EedED7RJbXmLFfjrBLaI/kV4275AbFXwlku6vEnfZ2CsltQ== X-Received: by 10.28.15.5 with SMTP id 5mr241021wmp.43.1508540375195; Fri, 20 Oct 2017 15:59:35 -0700 (PDT) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id u7sm1533928wmf.15.2017.10.20.15.59.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Oct 2017 15:59:34 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, Florian Fainelli Subject: [PATCH net-next] net: systemport: Guard against unmapped TX ring Date: Fri, 20 Oct 2017 15:59:30 -0700 Message-Id: <20171020225930.11907-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/ethernet/broadcom/bcmsysport.c | 3 +++ 1 file changed, 3 insertions(+) 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; }