From patchwork Fri Jul 31 06:46:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florinel Iordache X-Patchwork-Id: 1339251 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=selector2 header.b=BYYBDaMN; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BHyW63015z9sTM for ; Fri, 31 Jul 2020 16:46:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731467AbgGaGqz (ORCPT ); Fri, 31 Jul 2020 02:46:55 -0400 Received: from mail-eopbgr80047.outbound.protection.outlook.com ([40.107.8.47]:50639 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731398AbgGaGqx (ORCPT ); Fri, 31 Jul 2020 02:46:53 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H+ixsT2KVs6j3cxaysa6PLqcgomPg+Lf3Ln3OsoMfBBnTODqu4ZzuNp/LJ6kBQdlCHODYbbOh6S07adgH2gCRKpShQAEpCOn8zopSbYlMjIjzjS98G75CivIObWGdhzNO7cltR3+ShdZ5l6l6m63w7NSMDbvgSQgherqcemZKJBzlvWPKss5BIle/CQbk2/ZwPSYINtTCTIzEE1iE2mPfbePPD6KWvHtzyES0OosBAnevfpmzQJn6KWnozziPJvbvKHB5Wo0S06ZHEKHZ1MWz6l3R8cJsEV+6DPPUxwBxYBSuPnD8NUsbL0h9otL6lVyl+nBlC4H3tbL80Zv841R6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R3CGbh8UdYFS22dNKgNlhERmZY+v06GM5lmF6PoDyno=; b=I44b2uE8ETrG+04ZxWdfGtgoA30mxFRsH7xB/97TLEPcjQGOVBZ9CiEnw7bEYLT7/7DAb6ORE4wD5Yw1/SiDc9DztL0aLjLLpa+RWfIbutv3/Wackrg/GOaTE0RnB0buSepSAvH4V79n2+ojGRMQIxiEOKy6kuuWlzSN6oemydArOBfcB416OiKmxETdCGwd+oAeOvmfURgp/P+cb63CFpNnW6jU3NoN2JbVn0R7IUS02I3plPF/mpLKJbiWU54IzycAvtibbA9l95M8gOjzXRt4+jbDl8gQgO5oGShRhosu+XLeqlEqHaSV1BeQDyUzansPVcwbJlx063L1kYqnDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R3CGbh8UdYFS22dNKgNlhERmZY+v06GM5lmF6PoDyno=; b=BYYBDaMNGYToOPmiIJcf8hhgi5q3WSFkjXgRmbXEBGDO+/HBAB6Kk5UUlF6USt0N2MfmoHjcrxXHSZINfD+iM7GU8YMQqeUGK/qUO/ThkuBClK2VdBsv5RzQBpaFJqkPeaJTc7fEY05nwDJhO4Yzc8d7ZiAXxfkThj5f39W6B58= Authentication-Results: nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5447.eurprd04.prod.outlook.com (2603:10a6:20b:94::20) by AM6PR0402MB3527.eurprd04.prod.outlook.com (2603:10a6:209:6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.24; Fri, 31 Jul 2020 06:46:47 +0000 Received: from AM6PR04MB5447.eurprd04.prod.outlook.com ([fe80::e115:af36:613c:5a99]) by AM6PR04MB5447.eurprd04.prod.outlook.com ([fe80::e115:af36:613c:5a99%5]) with mapi id 15.20.3239.019; Fri, 31 Jul 2020 06:46:47 +0000 From: Florinel Iordache To: madalin.bucur@nxp.com, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Florinel Iordache Subject: [PATCH net 1/5] fsl/fman: use 32-bit unsigned integer Date: Fri, 31 Jul 2020 09:46:05 +0300 Message-Id: <1596177969-27645-2-git-send-email-florinel.iordache@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1596177969-27645-1-git-send-email-florinel.iordache@nxp.com> References: <1596177969-27645-1-git-send-email-florinel.iordache@nxp.com> Reply-to: florinel.iordache@nxp.com X-ClientProxiedBy: AM0PR06CA0112.eurprd06.prod.outlook.com (2603:10a6:208:ab::17) To AM6PR04MB5447.eurprd04.prod.outlook.com (2603:10a6:20b:94::20) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1464-128.ea.freescale.net (83.217.231.2) by AM0PR06CA0112.eurprd06.prod.outlook.com (2603:10a6:208:ab::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3239.16 via Frontend Transport; Fri, 31 Jul 2020 06:46:46 +0000 X-Mailer: git-send-email 1.9.1 X-Originating-IP: [83.217.231.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9fa35e88-1e41-43af-b5a3-08d8351d7ee7 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3527: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cJJ40wbgOjZsZPb+9/81oMuDDptmB9mixuydi/OxCRvUuj4OGC448tZFiIpykVprAytALW/ycBaY8gGml8L8cS/viMizcwO5Uch8v5410N+27IetFjXxGPNtqspOn5cUDz764tGaRKf7EBwLIUOi2g2UCkO6m9hYiyLaPTrtRlmeiXTT/l3KT1N1/OEEFdgZNjy0PFJkJn0ibXWz+6txAwON+imzc5QjM6How1t7W2a2jG8WCs0VZBftEu7jFtn1wLY0cpewbNasYsiHig2HSEtQq4Md2uydsPjMrs7RgUDGzEQDLkW12LweLpVfkNkyWDSacgW/Tp8UGjR9Uq9WlA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5447.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(396003)(376002)(39860400002)(346002)(366004)(316002)(83380400001)(36756003)(44832011)(66946007)(5660300002)(2906002)(66476007)(6506007)(66556008)(8676002)(6486002)(26005)(6666004)(2616005)(956004)(8936002)(4326008)(3450700001)(16526019)(6512007)(86362001)(478600001)(186003)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: AKQ1aHdjYr7UdIFGI17IdINX3VOgAqhciC8awnlAluHoEGN5EIwr+Gj2y5qXUszBiMj+Msabyr7PdACjE2oyVXNZtPO+R0n2x84p9iU8OhHZ66nTWVsBPujafYtAEE6xQxHJdfY+rxzMjgwfMh5u4rrntLfSdTCVxbHk3WvXBjzVxOSBTxOYi7I2gEWZHvIQE1sWliqrqv8XCz61zvNeoOW/YwOrBMcwFQjlXpl2gEy1loobGxhNizHYschFI32XgY4TJVh+qikhu0mZJlT4GU4VlSdnKSv7n1DSh2GiZfmNaO/tHLpyGJeflpZxJe/jsCnkdYk0LjvqOvAsUV35Eh9x5Yh/q/FD+ngbOE8FbBiHX0PLX91KR5zEKULheiewMQDQ0PJyT/jX6gDtl6tnyYzH6OzxDAO5oYxxJyCX2k4CZN1RNskxM4BnmJYxzTm5SoxSrFYrFhV8NesmOo3oSecangOnUi4tHaan/YR4dXM= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fa35e88-1e41-43af-b5a3-08d8351d7ee7 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5447.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2020 06:46:47.4991 (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-CrossTenant-UserPrincipalName: tGkWg16PHLunv5PeI5hXs68XRwqBmXG78916Pdd5QljVF1M+E+h1jBXVELhdb28PMrTJfnHTkHDFlRa89mnyTwzNeIjsCFpXC0xV0aK/Gtg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3527 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Potentially overflowing expression (ts_freq << 16 and intgr << 16) declared as type u32 (32-bit unsigned) is evaluated using 32-bit arithmetic and then used in a context that expects an expression of type u64 (64-bit unsigned) which ultimately is used as 16-bit unsigned by typecasting to u16. Fixed by using an unsigned 32-bit integer since the value is truncated anyway in the end. Fixes: 414fd46e ("fsl/fman: Add FMan support") Signed-off-by: Florinel Iordache --- drivers/net/ethernet/freescale/fman/fman.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c index f151d6e..ef67e85 100644 --- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c @@ -1398,8 +1398,7 @@ static void enable_time_stamp(struct fman *fman) { struct fman_fpm_regs __iomem *fpm_rg = fman->fpm_regs; u16 fm_clk_freq = fman->state->fm_clk_freq; - u32 tmp, intgr, ts_freq; - u64 frac; + u32 tmp, intgr, ts_freq, frac; ts_freq = (u32)(1 << fman->state->count1_micro_bit); /* configure timestamp so that bit 8 will count 1 microsecond From patchwork Fri Jul 31 06:46:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florinel Iordache X-Patchwork-Id: 1339255 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=selector2 header.b=l605n0tA; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BHyWV6WvVz9sTM for ; Fri, 31 Jul 2020 16:47:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731510AbgGaGq7 (ORCPT ); Fri, 31 Jul 2020 02:46:59 -0400 Received: from mail-eopbgr80047.outbound.protection.outlook.com ([40.107.8.47]:50639 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731351AbgGaGq4 (ORCPT ); Fri, 31 Jul 2020 02:46:56 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MbptyMmlxASD8yne0MAoeZA83ZXMvECbXdgsW+SphlEy5L5pc0vtvq6K2M8x57ZfBiyUz6C1WAL9ccR3BS1Wr8q1xqA3ajQXLvj1z04p7N5/S97peIWevhRXoWCpaeZQ1lAax2Q9vEJdNMHxYmuqjdHu1AEJOXGYb6qChmKP9RGyd1hO1TBWqFmL3a9jDYhkaAdVTBIAsdk8l05n+Lfn7MBWo4+wYUMK9jaK6T2htLg2T4SjsUHdmLLuEfFgCIUAlaVikletsN89QAuPuIepB72S2Qt1ldJk85xv/4tOaTZKh6vCqn4c+Xl0yVs+tOURrPUSc6upFPdRrbait+qQNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u5cBx1oXIzt1s7VrjVH/78iqviUUrr4v8mgMpeaFfJE=; b=NuOXOKO5tKxjXoHl19095K2qZZc/2hVmtfyDRIKNdQA/E8pLeIRLCWNgyN5aVMVBl1ovs2RMddMyeKvFhS9OHpd7PGd2Y4k5WjZhIYp8o1wSCPEzRdkfeKd5IeFDUavHFEPY4fb3yjJiuCOWi00KVxTjAL0ln8qXEa0GKQySHhqskS4DS5SHsdzKkUJJDdl7EWAWB5JiCq6AsfVaFQjywS0RZTN9hV1L9MH6MwG7iSGBSV5LK257Wlxssp6NqRohqLA38Mv0kHkAuKBR7tSnAIoD8u4EXAeKoyqrBIiFJKfAQAzzU8M472ZfFkRj1N7B5edWVreq/r5EuvMF9yBy+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u5cBx1oXIzt1s7VrjVH/78iqviUUrr4v8mgMpeaFfJE=; b=l605n0tA6K/2/vuzkX4Yquq2SgpHVC7NXIzMPVwR+7II8k1KBQ7PsqmzjkPe4/uNmdzeZ321NGEq7Ue6yWzpQ9iG3FUe/pxAWqlh5Qz1hw1ui8chHRYN+ETa/ZrroDPbRv+O7/iCDvf4xzxhmR/xj1rZWp7+t36A4bQiNtLsMng= Authentication-Results: nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5447.eurprd04.prod.outlook.com (2603:10a6:20b:94::20) by AM6PR0402MB3527.eurprd04.prod.outlook.com (2603:10a6:209:6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.24; Fri, 31 Jul 2020 06:46:48 +0000 Received: from AM6PR04MB5447.eurprd04.prod.outlook.com ([fe80::e115:af36:613c:5a99]) by AM6PR04MB5447.eurprd04.prod.outlook.com ([fe80::e115:af36:613c:5a99%5]) with mapi id 15.20.3239.019; Fri, 31 Jul 2020 06:46:48 +0000 From: Florinel Iordache To: madalin.bucur@nxp.com, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Florinel Iordache Subject: [PATCH net 2/5] fsl/fman: fix dereference null return value Date: Fri, 31 Jul 2020 09:46:06 +0300 Message-Id: <1596177969-27645-3-git-send-email-florinel.iordache@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1596177969-27645-1-git-send-email-florinel.iordache@nxp.com> References: <1596177969-27645-1-git-send-email-florinel.iordache@nxp.com> Reply-to: florinel.iordache@nxp.com X-ClientProxiedBy: AM0PR06CA0112.eurprd06.prod.outlook.com (2603:10a6:208:ab::17) To AM6PR04MB5447.eurprd04.prod.outlook.com (2603:10a6:20b:94::20) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1464-128.ea.freescale.net (83.217.231.2) by AM0PR06CA0112.eurprd06.prod.outlook.com (2603:10a6:208:ab::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3239.16 via Frontend Transport; Fri, 31 Jul 2020 06:46:48 +0000 X-Mailer: git-send-email 1.9.1 X-Originating-IP: [83.217.231.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f9b96ca6-c5d9-4a94-2fb5-08d8351d7f9d X-MS-TrafficTypeDiagnostic: AM6PR0402MB3527: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:475; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 11H2+THL/0IL7OebsR9SXshpAdH1YofEu8y78EuxY1Tt8gz58ZW6EGMUQ4xFvgDAeXj1LUF2ddjUPfHYprXr+stcHArBCfWOxJmNRy2MGyFkthnDqpgD535ueWoyggA55+qBi7Sa7U9godE92qOFMmbfdu/3cNYd2baIKZaL4MhhYEHRar+AMbOE6BfJoD61uucinH5O6Q13nd1aPNrrnucxmF5rXb4dyRQEwkgvpWMCxSiHqwFb+HWZ8tyq7xBQ8SqvqEkm0fCX0UuH5sC4KipqQ8gNja9EGq4iJO2bDCb0VwyptbXkas722C3I+5INR/UaMifDKKqIsAhaHPxeOw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5447.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(396003)(376002)(39860400002)(346002)(366004)(316002)(83380400001)(36756003)(44832011)(66946007)(5660300002)(2906002)(66476007)(6506007)(66556008)(8676002)(6486002)(26005)(6666004)(2616005)(956004)(8936002)(4326008)(3450700001)(16526019)(6512007)(86362001)(478600001)(186003)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: As77zo9NwbjO4WSGcrTEZ/3Br3Jf7C+JHN8bFnW8Owx8y7f4LFoOoGtkpZy7eeXc+ydD5YZDA5Iv9PwgAiTb9YMfXl44gpT+Cu/mLO8WM67b0D0R07tsKsT0vgBoX8iguAjho3LngozN9XXgnL6H4VqYVA2jxk7Xwm25XVNsHJ1ey/pikk3TPAq6p/FGUPXRBEi5z4JMCICzOTBW57FDS4HWcLMDOHuzjX/uYPucCS+3JmYP+YyVOouj/32IfyPORZQJCOJDaCqM0xxqIGwfEUdJoVNiw+pBJkgpzvsKLFOoBU5efrwwYsDCiq1qJr0qhLSg15Ne78SSwHZbzTtS/FkmfOEijlc3bI402o6NLTneL0JJR+QFsC2S1GB7DHdegQ9WJnKDVUXjb630+/VI7pWZ6capOKJhtzDYNoc7NTtyLlm/kvjb2TOvz1hp36fP7bD8KqxgrLmCXWTXasjwVi+iq1aVFe5k2Yy57zYg81s= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9b96ca6-c5d9-4a94-2fb5-08d8351d7f9d X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5447.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2020 06:46:48.6155 (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-CrossTenant-UserPrincipalName: 5I3wb2SPXSn9d26bQLWuVWsYcMzU44Z0O4nufCaUKu+xfXJeyrIKRWn6RovhJ8oaPH2iLDyDNi5K6X2DedWsaNbYhalJ3VwzxPh8eNkZrWc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3527 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Check before using returned value to avoid dereferencing null pointer. Fixes: 18a6c85f ("fsl/fman: Add FMan Port Support") Signed-off-by: Florinel Iordache --- drivers/net/ethernet/freescale/fman/fman_port.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c index 87b26f0..c27df15 100644 --- a/drivers/net/ethernet/freescale/fman/fman_port.c +++ b/drivers/net/ethernet/freescale/fman/fman_port.c @@ -1767,6 +1767,7 @@ static int fman_port_probe(struct platform_device *of_dev) struct fman_port *port; struct fman *fman; struct device_node *fm_node, *port_node; + struct platform_device *fm_pdev; struct resource res; struct resource *dev_res; u32 val; @@ -1791,8 +1792,14 @@ static int fman_port_probe(struct platform_device *of_dev) goto return_err; } - fman = dev_get_drvdata(&of_find_device_by_node(fm_node)->dev); + fm_pdev = of_find_device_by_node(fm_node); of_node_put(fm_node); + if (!fm_pdev) { + err = -EINVAL; + goto return_err; + } + + fman = dev_get_drvdata(&fm_pdev->dev); if (!fman) { err = -EINVAL; goto return_err; From patchwork Fri Jul 31 06:46:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florinel Iordache X-Patchwork-Id: 1339252 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=selector2 header.b=KeBv5tCr; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BHyW95wZnz9sTV for ; Fri, 31 Jul 2020 16:47:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731524AbgGaGrB (ORCPT ); Fri, 31 Jul 2020 02:47:01 -0400 Received: from mail-eopbgr80047.outbound.protection.outlook.com ([40.107.8.47]:50639 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731369AbgGaGq7 (ORCPT ); Fri, 31 Jul 2020 02:46:59 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OPHEJLfbE95d+OGqjpIkWz8+8SLUcrta/LNpozn6lRlPB+Glv3LmAcT9YOAutZkYq1EqR87R2S47oWLKI43J58u0ZTaElBJWVUu7+1Km1YvKAhwh1pfFuFLUKEGEz7h69TAWsFIzwy6DoemgZ+g8I0NLyqppak+yNX0ZAEdPH3TvwlVBwA7CB+cMyCWNM3Rx5IHrGj+2MaQQGEON+C7L+jIOwtupUFdpIf6hWJsrgRcfSJ0D2DfBVmwpeNn8fGaeQMA9t6EHCNt0llCobTKacvgOEk5OlB9ie+064yaCkXSr8rZyCf/KX5EA9vgYcEn62kTLSQRONQvMy8w+m0RSdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h+k3zTGIorzKzSF9q3bLCk7znC0tnDPekh7/p0sGHCM=; b=DYQFgJnGfT+MF+QjHl89gBSe4n2YKgW9BtgUYWITMV+QU7VVoHJfI5GbHoLbcm1zBNcWbfZ49RNLoCcofJnd8VmWzcwL1+Z1hUw14yrPE0xmBAJ2rF4F9BbMiHThTPmVVQlepvQI6Kka2l5yU2tsjPKoP1V8l5fu55EGak8qSO3/zFB1aEcWqdhLQdua2r7O8rhk5VH1mpsje4rrXnNqXyvF0IIF/w1GXQSGsg5RPWTftTXDzxSBZguCYL6KU/5Oz3s0l3PcFv8ttaRpXz1tgbaWd5M0bszr1EHtUDESQLiZbWFGIKZnP3BlTYahlfk4VV+WPsj+O+WLrqXGLzzx5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h+k3zTGIorzKzSF9q3bLCk7znC0tnDPekh7/p0sGHCM=; b=KeBv5tCrGibuHiaaUACBO7g3ltnNB30M/0iHHNHH4C8WI5QFxw35rhNa38bAptFgcIT8Ie3Ga/HO9zPN1IbNWcXWcDiTGVBd/wUS0CwOq2lsmaRZEhudeoXqzp8qH3cHJcPffV2GUzYtJj0L9TUpO+kZodaeRGJxVfMVvhlrvDw= Authentication-Results: nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5447.eurprd04.prod.outlook.com (2603:10a6:20b:94::20) by AM6PR0402MB3527.eurprd04.prod.outlook.com (2603:10a6:209:6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.24; Fri, 31 Jul 2020 06:46:49 +0000 Received: from AM6PR04MB5447.eurprd04.prod.outlook.com ([fe80::e115:af36:613c:5a99]) by AM6PR04MB5447.eurprd04.prod.outlook.com ([fe80::e115:af36:613c:5a99%5]) with mapi id 15.20.3239.019; Fri, 31 Jul 2020 06:46:49 +0000 From: Florinel Iordache To: madalin.bucur@nxp.com, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Florinel Iordache Subject: [PATCH net 3/5] fsl/fman: fix unreachable code Date: Fri, 31 Jul 2020 09:46:07 +0300 Message-Id: <1596177969-27645-4-git-send-email-florinel.iordache@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1596177969-27645-1-git-send-email-florinel.iordache@nxp.com> References: <1596177969-27645-1-git-send-email-florinel.iordache@nxp.com> Reply-to: florinel.iordache@nxp.com X-ClientProxiedBy: AM0PR06CA0112.eurprd06.prod.outlook.com (2603:10a6:208:ab::17) To AM6PR04MB5447.eurprd04.prod.outlook.com (2603:10a6:20b:94::20) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1464-128.ea.freescale.net (83.217.231.2) by AM0PR06CA0112.eurprd06.prod.outlook.com (2603:10a6:208:ab::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3239.16 via Frontend Transport; Fri, 31 Jul 2020 06:46:48 +0000 X-Mailer: git-send-email 1.9.1 X-Originating-IP: [83.217.231.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: defbf991-07ff-4240-c8f1-08d8351d8007 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3527: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rr60HwNFaYDwZFhxEnaV5gqDWPJcAzeu+sdhzY0WKR01ScQdctAkqjTGVH9YfSuZEURmEI/Hz6Mwr+hTrUb3NzZYu2n9OSvO4zVFKzg/yNXexicW/EGOnWHmZTm52ScdYjyIgwq4Tsl3vs0T4js6/w/PPe/Js17wtgTqElu6LbUImU3fyHpHttBbJB+saDVAE2XDO2/QyW+JYedwF9YN1vVzAeOjrLbj8YRzmFd0IxGdpic1lxxZ6NZ43XWM2Qy6zXgfUO/Q+7euTE8094kChA6wnBU5OYU0MnwlDVP9GjGJvGJzhIlvG8TRA19h4DpRNnE16whFNVKfp7mcT95XkA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5447.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(396003)(376002)(39860400002)(346002)(366004)(316002)(83380400001)(36756003)(44832011)(66946007)(5660300002)(2906002)(66476007)(6506007)(66556008)(8676002)(6486002)(26005)(6666004)(2616005)(956004)(8936002)(4744005)(4326008)(3450700001)(16526019)(6512007)(86362001)(478600001)(186003)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: L8s1e6nberJ4edZ8mRLQT1BdDgi1kqOIS6z47nMho+jQf/xYfywzTv70rBDExc/ltghxhzEiKh1VvBrbB5+tjndRvMAdTzzPtnim7t5sNAJxLTE6ICUawEWw0uL6iUn6mbYRoXDu6xfwhSTZ6DwsOmbMQLLapVVtDR4UQuHfNqDZGHHHxyv8OTCkd72LZk+ybCQl4rbuVdnTj+ncuqaNHTQ2QUTuHq4kmuFdbP0v9oaS5byFucBje95esnXonMWHZYFrYd/E9n74VmXJBF6xAN5MluKkxAS0dZoTeQK0Za8KcFsyQB5uVmIeg98Lm9eKlGQGrXOltnOnHRX+g4oLR4Ll13PbQUyARyjy/au69NdZjX2Ravx7coehnviZme1rFSchQu8dJIAsZ+fmqGpFaLNVAffsxk+TsoMOTCEniG0lhn12RhF4RnhiOlQ6NFFuBV0bZu//sz06c5ryHTyQ/jteegT8ShmppWwhWDyt/OY= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: defbf991-07ff-4240-c8f1-08d8351d8007 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5447.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2020 06:46:49.2711 (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-CrossTenant-UserPrincipalName: qi6Od3WjNGH4ZZ+q53feIjZRQevvaM3tALhyN0FbFYjNWlxKlbZ1f2YyCuyz4LwYjiY8xVccrX47n6vIRr/FIJvyezw8JW3hdOOsMgLRn+I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3527 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The parameter 'priority' is incorrectly forced to zero which ultimately induces logically dead code in the subsequent lines. Fixes: 57ba4c9b ("fsl/fman: Add FMan MAC support") Signed-off-by: Florinel Iordache --- drivers/net/ethernet/freescale/fman/fman_memac.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c index a5500ed..bb02b37 100644 --- a/drivers/net/ethernet/freescale/fman/fman_memac.c +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c @@ -852,7 +852,6 @@ int memac_set_tx_pause_frames(struct fman_mac *memac, u8 priority, tmp = ioread32be(®s->command_config); tmp &= ~CMD_CFG_PFC_MODE; - priority = 0; iowrite32be(tmp, ®s->command_config); From patchwork Fri Jul 31 06:46:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florinel Iordache X-Patchwork-Id: 1339253 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=selector2 header.b=sSHRE1Uv; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BHyWK4k2vz9sTV for ; Fri, 31 Jul 2020 16:47:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731535AbgGaGrH (ORCPT ); Fri, 31 Jul 2020 02:47:07 -0400 Received: from mail-eopbgr80047.outbound.protection.outlook.com ([40.107.8.47]:50639 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731351AbgGaGrD (ORCPT ); Fri, 31 Jul 2020 02:47:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ghSeVja7lAZOyfreNQ9w66rN04+II69joYR7gZUO1hulV+sG6lCrFX9PA1EBnhLDMRvIB4ZpxdUx6zRdG16uqIGPzLxuibv1zzRikgKm61sEgg5OEv884xvtLfnP7wV6LvTtwK3M2x9Ed5dOHgHdG5/pOSsSc+UpsyJHp9swJ5utf2qv6MhEAQGiacZqrkPWGhCD6ZboriuBcnO0zD15GLLh5D3A5UtQoCOWEgwa1MGjVlnlVHfl+PGF5mCuYjSWqbDIJLKJcfNPNLfqqD6pDH29qeSLssTPIFrU5/r7wnt/LoKAtUi9wheL9S41XaFK7eSCfmgvcGbbvFkXH/KoHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JIFqgGufNAWYsh6zczVA9+IdU/14r5N8QN5MVY0BwNE=; b=Xrr5EMx1+p+AkGaAMQTZGtD6qNqz05cw3vuNrPQsK0W+puo9BqhQFYJxf2DOyGWIBOgSWIJg32yHl5whAnM2NeMqK8SD4/qFCFi664G3zr3nQvnXaANS0ZL1zUoNsEXoH+IubmqBVS7D6O/Q4jLFMwHoQ3zWbnjhzwf6NX/dnLy2jQz2r7vTCi2Ngqn4GLJz4t4G1q0jYuENbGHYs43zEv7+EfraN+9smhbj2Zu6+NZGw4w1n/i4GcUMtOj511t/jqQngYU6KohrJ+dxWc9lQeLwBysGCVZUiGUIRSUPmBK/ef3WvdbYdy/rlKIQGFTf63jHH9SZgxOU/as4KhShng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JIFqgGufNAWYsh6zczVA9+IdU/14r5N8QN5MVY0BwNE=; b=sSHRE1UvkmhO+zQ9Z7He9QKa6WzQYSqM3Ic+S2smyEzW3i7IGFW1yC/WsO5avVbVdXkMuqC3MU54S56pvHFETbC08rnzlMkyWKUYthPsE275oC9cYnJTgomq22V4Qy9QjNyGqwPi1MApQECkGTnAkCNu6F80NZ6sXn+kP1xlBo4= Authentication-Results: nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5447.eurprd04.prod.outlook.com (2603:10a6:20b:94::20) by AM6PR0402MB3527.eurprd04.prod.outlook.com (2603:10a6:209:6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.24; Fri, 31 Jul 2020 06:46:50 +0000 Received: from AM6PR04MB5447.eurprd04.prod.outlook.com ([fe80::e115:af36:613c:5a99]) by AM6PR04MB5447.eurprd04.prod.outlook.com ([fe80::e115:af36:613c:5a99%5]) with mapi id 15.20.3239.019; Fri, 31 Jul 2020 06:46:50 +0000 From: Florinel Iordache To: madalin.bucur@nxp.com, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Florinel Iordache Subject: [PATCH net 4/5] fsl/fman: check dereferencing null pointer Date: Fri, 31 Jul 2020 09:46:08 +0300 Message-Id: <1596177969-27645-5-git-send-email-florinel.iordache@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1596177969-27645-1-git-send-email-florinel.iordache@nxp.com> References: <1596177969-27645-1-git-send-email-florinel.iordache@nxp.com> Reply-to: florinel.iordache@nxp.com X-ClientProxiedBy: AM0PR06CA0112.eurprd06.prod.outlook.com (2603:10a6:208:ab::17) To AM6PR04MB5447.eurprd04.prod.outlook.com (2603:10a6:20b:94::20) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1464-128.ea.freescale.net (83.217.231.2) by AM0PR06CA0112.eurprd06.prod.outlook.com (2603:10a6:208:ab::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3239.16 via Frontend Transport; Fri, 31 Jul 2020 06:46:49 +0000 X-Mailer: git-send-email 1.9.1 X-Originating-IP: [83.217.231.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f8c7f9fb-17d5-45fc-9fa1-08d8351d8068 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3527: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1wa7arRJPNjYGK7Wt+OmmOTQdYTeOcW7KB+wrvh5fKAwidJP3c3r3gwso9SmFSMR8Z4XoBPetXWcoskWUP3UdknSwZge06HLdhCzPoFndWQ/ONCAPTtEQLeSYXE93vq6XmiBcb4RrHy7x79rdwWGgEBpV5pED7juuFHy0qoaEy8FjZqYjouTAMSI2iOf9TsJUpYL9sdx/mzd1Xc4aBmSnJN7UP6rpzI7NpAo2AVwaor39GIT7jsRHcsOj6c05EXCEcfKC9YxLc/w+i92ljuQ328dvsmnpv5QgOSURsxGYMHMxS7klAxxVOdJB5kr1j3o X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5447.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(396003)(376002)(39860400002)(346002)(366004)(316002)(83380400001)(36756003)(44832011)(66946007)(5660300002)(2906002)(66476007)(6506007)(66556008)(8676002)(6486002)(26005)(6666004)(2616005)(956004)(8936002)(4326008)(3450700001)(16526019)(6512007)(86362001)(478600001)(186003)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: /3gkowsFY8CuSPaR3jtqOSlJB7HqsuQ9eknCHbEaC5arZzZGCJi2uIOGYCh18AIOZCvKB6NocuosLDqbUfaHG8thYRGfEZKNW9EtPT5tCLqV0fqiH6XXEzc7T6TnnoytZn27DuFNHl6Oo6ECKrMeMMOS2hA1IA6EAHN8skEapEn8jXogllpZt065l1xI9CnE1Ypo/84UD4V31os6WX4N18WiGAL+k+lMMmiSMIto4JZ6b6mBAF5pp/0uAUKNTXkos0KbgU6d+1KR7Z50nNRJbHw9EFQaEIv5tWvmQpKXxKyKHDxmcQHTCL9kcrBL4lYFZ6H372DuVhuEFbCZXVdVWnMa1eZR0NID3bRKJINOOWebiaZgcqIznlmLlRABMEHlpMgwp8JeamGt5q67VvEmzGyUH6tA0b/mTKJKKOt6Ekv1jJK61lmkKKdj9dxczMygU93hT1Ke/SWl1CGaDnu4FwKOBe7OurOAIlIv1UQTTWY= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8c7f9fb-17d5-45fc-9fa1-08d8351d8068 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5447.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2020 06:46:49.9627 (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-CrossTenant-UserPrincipalName: 7L/k0+kWHQp6amhugnfIWPqRDNetx3XjysnqAEfEITe97gTZMTeFnEGt56/tU78uwD/lVm79Vs0hYaGFAI43g5NojdA6acGv4p6bb22WZQ4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3527 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add a safe check to avoid dereferencing null pointer Fixes: 57ba4c9b ("fsl/fman: Add FMan MAC support") Signed-off-by: Florinel Iordache --- drivers/net/ethernet/freescale/fman/fman_dtsec.c | 4 ++-- drivers/net/ethernet/freescale/fman/fman_memac.c | 3 ++- drivers/net/ethernet/freescale/fman/fman_tgec.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.c b/drivers/net/ethernet/freescale/fman/fman_dtsec.c index 004c266..bce3c93 100644 --- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c +++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c @@ -1200,7 +1200,7 @@ int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr) list_for_each(pos, &dtsec->multicast_addr_hash->lsts[bucket]) { hash_entry = ETH_HASH_ENTRY_OBJ(pos); - if (hash_entry->addr == addr) { + if (hash_entry && hash_entry->addr == addr) { list_del_init(&hash_entry->node); kfree(hash_entry); break; @@ -1213,7 +1213,7 @@ int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr) list_for_each(pos, &dtsec->unicast_addr_hash->lsts[bucket]) { hash_entry = ETH_HASH_ENTRY_OBJ(pos); - if (hash_entry->addr == addr) { + if (hash_entry && hash_entry->addr == addr) { list_del_init(&hash_entry->node); kfree(hash_entry); break; diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c index bb02b37..52ee982 100644 --- a/drivers/net/ethernet/freescale/fman/fman_memac.c +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c @@ -852,6 +852,7 @@ int memac_set_tx_pause_frames(struct fman_mac *memac, u8 priority, tmp = ioread32be(®s->command_config); tmp &= ~CMD_CFG_PFC_MODE; + priority = 0; iowrite32be(tmp, ®s->command_config); @@ -981,7 +982,7 @@ int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr) list_for_each(pos, &memac->multicast_addr_hash->lsts[hash]) { hash_entry = ETH_HASH_ENTRY_OBJ(pos); - if (hash_entry->addr == addr) { + if (hash_entry && hash_entry->addr == addr) { list_del_init(&hash_entry->node); kfree(hash_entry); break; diff --git a/drivers/net/ethernet/freescale/fman/fman_tgec.c b/drivers/net/ethernet/freescale/fman/fman_tgec.c index 8c7eb87..41946b1 100644 --- a/drivers/net/ethernet/freescale/fman/fman_tgec.c +++ b/drivers/net/ethernet/freescale/fman/fman_tgec.c @@ -626,7 +626,7 @@ int tgec_del_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr) list_for_each(pos, &tgec->multicast_addr_hash->lsts[hash]) { hash_entry = ETH_HASH_ENTRY_OBJ(pos); - if (hash_entry->addr == addr) { + if (hash_entry && hash_entry->addr == addr) { list_del_init(&hash_entry->node); kfree(hash_entry); break; From patchwork Fri Jul 31 06:46:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florinel Iordache X-Patchwork-Id: 1339254 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=selector2 header.b=NVp8zIh/; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BHyWN1Gshz9sTV for ; Fri, 31 Jul 2020 16:47:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731548AbgGaGrL (ORCPT ); Fri, 31 Jul 2020 02:47:11 -0400 Received: from mail-eopbgr80047.outbound.protection.outlook.com ([40.107.8.47]:50639 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731369AbgGaGrG (ORCPT ); Fri, 31 Jul 2020 02:47:06 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=evoZsEzQoSTdqokiadry6exJqo6TaKjxpuw4GL16iK6ogZJgr0gC37z8IkTr6Hqc7yCJEGytvJ7CJo2tUZjmmWrUoxHHAtb/JOfH/WfadHuKJbtPb3mz+QRl8hS9opjEAraqkpaAXFgyCu6Z5oaHVf/yrbBG0OIvuUQ0oz57glxUhtTA0bPqd+L2KARJq6UA6FyjeKKzYBzHMsuNssmlrvK/DIu9g9+7t1BYUM2HEynI4erxOQcCzXhm/UC3wpxwzzKH7+M2D7djqxLXK6KfaPA2Gar6iX45thsX0eQP8c6sa3wYi3e4CUZGqWDocPdLZXj6PCccTHw3BltK4GGy8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C+oOiX9aT+OE8EfR4SSw78j88ODWfdI91Wl8rZ1rJz4=; b=gvQ6rXaczuF5jdZ4ZpG++7qzBw9vqabYUDaPtdFtRxGbgWpWGI9YxKCRWWSUT05hUQ5fTSCBoAICOD4pGw7xJq5Cv2Xk/TC2HccN8R/y7wnb6Zbz7Rvsl+6VukLSHwgOvzF58GtQaCNa+4EAl6BTLYXxDrephWKRpxEHy0mviSHRMbKpdzIHNQnClvM12g3OlPyZRxxiFmzLDWOWngZKEnRLCAeh0XLIie4lHYPDspVwUEsvElXAFQaV/KzyAAa9xmfY9Yn3ldLY9WPZnIQPQfnpohxiFwKyqv15nkGmP/Bto5T44l/Uq4WAx1Z9W0GEu2jG0ruFXidpi9XY0yKYNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C+oOiX9aT+OE8EfR4SSw78j88ODWfdI91Wl8rZ1rJz4=; b=NVp8zIh/lMMOFdDaFrTi1Je71WioaHB3idnCEqmW2H/lsWAAMHeSmCfwg6gr6WtDd2cIdOWzs7iVnwIMn9zErLw/0BLjtIBblSMD6p+2iWtahCQv0mUwCz7E+UFt9SfDX1+8h24PdlQ6fK/b/ZevnR8Lhsg9ufG389a4KEW50q0= Authentication-Results: nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5447.eurprd04.prod.outlook.com (2603:10a6:20b:94::20) by AM6PR0402MB3527.eurprd04.prod.outlook.com (2603:10a6:209:6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.24; Fri, 31 Jul 2020 06:46:50 +0000 Received: from AM6PR04MB5447.eurprd04.prod.outlook.com ([fe80::e115:af36:613c:5a99]) by AM6PR04MB5447.eurprd04.prod.outlook.com ([fe80::e115:af36:613c:5a99%5]) with mapi id 15.20.3239.019; Fri, 31 Jul 2020 06:46:50 +0000 From: Florinel Iordache To: madalin.bucur@nxp.com, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Florinel Iordache Subject: [PATCH net 5/5] fsl/fman: fix eth hash table allocation Date: Fri, 31 Jul 2020 09:46:09 +0300 Message-Id: <1596177969-27645-6-git-send-email-florinel.iordache@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1596177969-27645-1-git-send-email-florinel.iordache@nxp.com> References: <1596177969-27645-1-git-send-email-florinel.iordache@nxp.com> Reply-to: florinel.iordache@nxp.com X-ClientProxiedBy: AM0PR06CA0112.eurprd06.prod.outlook.com (2603:10a6:208:ab::17) To AM6PR04MB5447.eurprd04.prod.outlook.com (2603:10a6:20b:94::20) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1464-128.ea.freescale.net (83.217.231.2) by AM0PR06CA0112.eurprd06.prod.outlook.com (2603:10a6:208:ab::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3239.16 via Frontend Transport; Fri, 31 Jul 2020 06:46:50 +0000 X-Mailer: git-send-email 1.9.1 X-Originating-IP: [83.217.231.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: cae1b209-d50a-48a3-e650-08d8351d80d4 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3527: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x/LL48tZ5hzLOQUn9aF21YVTGU7Qm9f8DPs+AvmUlhZQ5QbLjAOLWLpvReELz+nBysA+0LaQQRd9rCxG6pS3LhPII+dNhd678IWrOR+KxWYB22jqoU9Rn/KP8hCiZdZZyWF7smvddWkQbfTVPNwAV2I5h0qd4B54crmLbJqPjG8U8KdwdMiLZPfomC6yTjBW3gt9MDIGKVStay5zLrPAeA8POAcsZHKdXgvwIr1/U56EvkHLMq76g7aKO8IZk2+a3SgtrLSKuHW128Jr0X3Rl4NMaxm3o1cbM5gmQReYxTXj9+4Sil/lu89ulseS2sMsiKbn+R3NNwMXLGLX9s+2TQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5447.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(396003)(376002)(39860400002)(346002)(366004)(316002)(83380400001)(36756003)(44832011)(66946007)(5660300002)(2906002)(66476007)(6506007)(66556008)(8676002)(6486002)(26005)(6666004)(2616005)(956004)(8936002)(4744005)(4326008)(3450700001)(16526019)(6512007)(86362001)(478600001)(186003)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: hmKWxtGh7e/rG6LLeiomzzAeTHEOgTmZQP5IkChodyXeSbkIQ4J8HHdJ06jhnNTaxL6+lvNM4wyt1qb7zQjUR1SWC0xwsaSoKQd5UC004fv4UAAav5zfHlZPZbgvllx6y1QoeqB6dQvF0s6+KkcIoku/LLvyPE1SNCOtlD+MJhSgs/aMF4nH5mjRE26Uj4StPiWr87Ukz/H0nHucLU7hleeBUoojGaqCZLtL/U4edPOiUtmJmvk6f4D7AHnB6DBd/zVz4nHyay4bNnXVCuOLTA0cWdbWeym2wmN5qqLi7LHxmnadMCJGtc3Agz5XaMobRKoMZys7ocjBbBnRl6S5vE/lo/F91dP7FzjMAXy7CJnjJqIJk6w6VyCuHOgHmDpQ47bS/ZUssHr7lm4SoTp7AIqmqOk3KWfvZiQxZqMPLqLLApHQCfdGJetOPeg1xpIgex+LWHeHqenfwxxbwNlGUj/k+ap/izyBIsHKa/NNclw= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cae1b209-d50a-48a3-e650-08d8351d80d4 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5447.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2020 06:46:50.6504 (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-CrossTenant-UserPrincipalName: XcOw53wECZdWLPHana8n6In8HNHxeZOuZZeOtWUVQXlqyDbzle2L0+3g/Xx3ICmUFlGGfbyPY18zXe5LSMlNnKwioi5sAxaAwXl3gGQJMc8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3527 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix memory allocation for ethernet address hash table. The code was wrongly allocating an array for eth hash table which is incorrect because this is the main structure for eth hash table (struct eth_hash_t) that contains inside a number of elements. Fixes: 57ba4c9b ("fsl/fman: Add FMan MAC support") Signed-off-by: Florinel Iordache --- drivers/net/ethernet/freescale/fman/fman_mac.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fman/fman_mac.h b/drivers/net/ethernet/freescale/fman/fman_mac.h index dd6d052..19f327e 100644 --- a/drivers/net/ethernet/freescale/fman/fman_mac.h +++ b/drivers/net/ethernet/freescale/fman/fman_mac.h @@ -252,7 +252,7 @@ static inline struct eth_hash_t *alloc_hash_table(u16 size) struct eth_hash_t *hash; /* Allocate address hash table */ - hash = kmalloc_array(size, sizeof(struct eth_hash_t *), GFP_KERNEL); + hash = kmalloc(sizeof(*hash), GFP_KERNEL); if (!hash) return NULL;