From patchwork Wed Mar 20 14:11:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Radulescu X-Patchwork-Id: 1059226 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="c3roeSUV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44PWzy4sKDz9sNt for ; Thu, 21 Mar 2019 01:11:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726812AbfCTOLI (ORCPT ); Wed, 20 Mar 2019 10:11:08 -0400 Received: from mail-eopbgr70053.outbound.protection.outlook.com ([40.107.7.53]:49026 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726303AbfCTOLI (ORCPT ); Wed, 20 Mar 2019 10:11:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aoXpbxkTNdi2Q857o+AZDxa3+STZa7FcspOOaGomkeA=; b=c3roeSUVi45fOWl2Xps8mK0kEyVXKZicpH2XNXvNRnuIt208GZhQKlP8flW/KC1zzVK1jenKIHVuE0h/9+0MtG4FW2eMA0paGZBCB/vWRWQtrBQBCRwJbqDAseBkZ77z5P7fe6SguqWTccqoq5Sew5t5HzO25WbMod5qyNpECDk= Received: from AM0PR04MB4994.eurprd04.prod.outlook.com (20.177.40.15) by AM0PR04MB4275.eurprd04.prod.outlook.com (52.134.91.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.14; Wed, 20 Mar 2019 14:11:04 +0000 Received: from AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::79c2:4db0:ae08:1a92]) by AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::79c2:4db0:ae08:1a92%3]) with mapi id 15.20.1709.015; Wed, 20 Mar 2019 14:11:04 +0000 From: Ioana Ciocoi Radulescu To: "netdev@vger.kernel.org" , "davem@davemloft.net" CC: Ioana Ciornei , "brouer@redhat.com" Subject: [PATCH net] dpaa2-eth: Fix possible access beyond end of array Thread-Topic: [PATCH net] dpaa2-eth: Fix possible access beyond end of array Thread-Index: AQHU3ybBTyMfu92j7kmlwnWod5rsQQ== Date: Wed, 20 Mar 2019 14:11:04 +0000 Message-ID: <1553091059-15991-1-git-send-email-ruxandra.radulescu@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR0501CA0007.eurprd05.prod.outlook.com (2603:10a6:800:92::17) To AM0PR04MB4994.eurprd04.prod.outlook.com (2603:10a6:208:c7::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=ruxandra.radulescu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [212.146.100.6] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0639b47b-1dc5-40bc-cb68-08d6ad3de3a3 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4275; x-ms-traffictypediagnostic: AM0PR04MB4275: x-microsoft-antispam-prvs: x-forefront-prvs: 098291215C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(396003)(366004)(346002)(39860400002)(376002)(199004)(189003)(478600001)(4326008)(476003)(14444005)(2906002)(25786009)(2616005)(3846002)(6116002)(110136005)(54906003)(5660300002)(256004)(102836004)(71200400001)(97736004)(486006)(14454004)(316002)(2501003)(106356001)(68736007)(305945005)(8676002)(6512007)(7736002)(8936002)(71190400001)(52116002)(386003)(50226002)(53936002)(99286004)(81156014)(26005)(186003)(66066001)(105586002)(86362001)(6486002)(6436002)(36756003)(6506007)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4275; H:AM0PR04MB4994.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: cUMJgRwDBFq65DiEXrUXHkmzNMpccipzO9S1E7xZka7AnNg+gvAW3mxjIa0IpIq+ZlyiI5ZZvse3EazkuV6v4yYHq3srqXkR86iiQn5mRoEWJVOok18SpkDdC5DJAsKS7D+q29XKCsqUwWpFSxUPPdt0K9Ebl9nWUKNBRR3Z+T846rBLz6w45CueJVJFzDtXdSwF7UoHv8SoUHij6ygrHlhjMZrcEm2nesbFIvMfyhcn7/oc11F43gHxi+t8PE6jsur9bVONidwhDzc8Tg1ITOAu+RJCMs6UFYzCNCPrrB16AcSuOcbP6sH0qsQX+dX9XrhzFjucRXQ6ibHsPY01V4fd9zml45z/8OuXRfXGgUgIIS1LqsyjG50oTLHUQMjCsdyt83eets24MSoAMxoPfim0eUZQfOYy0GdPwYDYZJY= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0639b47b-1dc5-40bc-cb68-08d6ad3de3a3 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Mar 2019 14:11:04.5508 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4275 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make sure we don't try to enqueue XDP_REDIRECT frames to an inexistent FQ. While it is guaranteed not to have more than one queue per core, having fewer queues than CPUs on an interface is a valid configuration. Fixes: d678be1dc1ec ("dpaa2-eth: add XDP_REDIRECT support") Reported-by: Jesper Dangaard Brouer Signed-off-by: Ioana Radulescu --- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index 2ba49e9..1a68052 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -1817,7 +1817,7 @@ static int dpaa2_eth_xdp_xmit_frame(struct net_device *net_dev, dpaa2_fd_set_format(&fd, dpaa2_fd_single); dpaa2_fd_set_ctrl(&fd, FD_CTRL_PTA); - fq = &priv->fq[smp_processor_id()]; + fq = &priv->fq[smp_processor_id() % dpaa2_eth_queue_count(priv)]; for (i = 0; i < DPAA2_ETH_ENQUEUE_RETRIES; i++) { err = priv->enqueue(priv, fq, &fd, 0); if (err != -EBUSY)