From patchwork Mon Aug 3 07:07:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florinel Iordache X-Patchwork-Id: 1340158 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=i2HU2cEI; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BKprp4HvWz9sTb for ; Mon, 3 Aug 2020 17:08:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726069AbgHCHIX (ORCPT ); Mon, 3 Aug 2020 03:08:23 -0400 Received: from mail-db8eur05on2079.outbound.protection.outlook.com ([40.107.20.79]:36160 "EHLO EUR05-DB8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725831AbgHCHIH (ORCPT ); Mon, 3 Aug 2020 03:08:07 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E1P6vsWgtg6wiEf88Ol9Bu/jFWGddkxaodt78oDJYrTa9KdO0/NvY0fILAGmbybbIify874BB2uIeDD5W0j6suQTRXSoVQ+BhiLPHM9PdxCjlKjRIoQYJHKxJc864rcXFHOCWQbh72nfSnFYf7P1i0QHT78I20fCoXnpsEf0lkBIgvpvmCYEUYCBV6EaBxMY0z9RlMJo5639QdsKo+lEHhXQBXirwV488TOCHhzljslWyvqnm3/rU7zUp0KBBIDoNIWGRPsLfLRhTFwZ/hTwB7VzSCz3fkSEsRZD1VSIt6yWK7buaYs6Sihe/PQiQ03OeEUpyhXvCusISaJZceqnXA== 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=D5EXPTd8jsItq9NYZoNS03BSXePTOwvGcM8pXbUG6zg=; b=E0J/H2ekjzHGQ7rmU7C/pI0kJafyNgiruJ/2mO1hz+yWvF9dexMB4QyWkDZD15fqGjEdbzGyvY21UdchtpDUTRHESqxx5Ua6KyrSCek/Nls3Lx4gL+9rL3ecIvm26nhLVirmgFhijQwwCEJ3IbCfQSr+HPjzpRRpg7GeRPtTJvEKBUTyMBs0iyG4zB52W8XgGG+1fRmex7zZbpcWSNIG7Vg4WzCb2hCDldnnSkcT34cGfIqmkuj3z4R6tLfANurrfa7EAvt/qjB6XQKiAA87RX22HGPeOCr5Vkj6nMuyXk7Dv/rxGWKoVDHNa4lv6ACN6mYwKHMH8REa/vQJm1OT1Q== 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=D5EXPTd8jsItq9NYZoNS03BSXePTOwvGcM8pXbUG6zg=; b=i2HU2cEI89cst8Nm2xwFox9nXndaIUBdaR6k8cINvR12zZKLBfXHLEpfQM+u+u/vlbE9WqSZSEoI+aSerJHQIYB6f92kSSQKN85FCLLmIWn1+kP4iQ+LoiyIManG+1LAno5zcHf0D1qtU8OY7cdtIU2Yi6wuoXVdGQ+ovi+NxRQ= Authentication-Results: nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB5443.eurprd04.prod.outlook.com (2603:10a6:208:119::33) by AM0PR04MB5233.eurprd04.prod.outlook.com (2603:10a6:208:c9::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.16; Mon, 3 Aug 2020 07:08:02 +0000 Received: from AM0PR04MB5443.eurprd04.prod.outlook.com ([fe80::f0b7:8439:3b5a:61bd]) by AM0PR04MB5443.eurprd04.prod.outlook.com ([fe80::f0b7:8439:3b5a:61bd%7]) with mapi id 15.20.3239.021; Mon, 3 Aug 2020 07:08:02 +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 v3 1/5] fsl/fman: use 32-bit unsigned integer Date: Mon, 3 Aug 2020 10:07:30 +0300 Message-Id: <1596438454-4895-2-git-send-email-florinel.iordache@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1596438454-4895-1-git-send-email-florinel.iordache@nxp.com> References: <1596438454-4895-1-git-send-email-florinel.iordache@nxp.com> Reply-to: florinel.iordache@nxp.com X-ClientProxiedBy: AM0PR07CA0007.eurprd07.prod.outlook.com (2603:10a6:208:ac::20) To AM0PR04MB5443.eurprd04.prod.outlook.com (2603:10a6:208:119::33) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1464-128.ea.freescale.net (83.217.231.2) by AM0PR07CA0007.eurprd07.prod.outlook.com (2603:10a6:208:ac::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3261.13 via Frontend Transport; Mon, 3 Aug 2020 07:08:02 +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: 9373fc1e-5a4b-4439-1981-08d8377bf64d X-MS-TrafficTypeDiagnostic: AM0PR04MB5233: 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: +anoBJC7a4FaSn5ix/lMYptTEtGH8t1QdanNfHO+F0IVoKPP3UMO/MNeJragPjBpgNl7dv7EcTiKsMwPk1s8GdAulxMlGXcPiXlyeTfgxFmE+7ajPTI4PErs7DvQq+oQk3M7v7M0TvGTh63p3olaeB+MWBf8wYZZpr0uhYEo60nahfFp3XC57Hs8bkLlyppb5S+4z5018Cy2DDPgannHpCO5ttpycv7W1XhEIwiu8K3Iegy9+PVi2y3DrU5Lpzj0zN0E38Am+O7y3nVudjGM5g07BC7tnNhXfAKVxg5paa4YWnHi5jlHjxahJNNghmWud55gtgk0YQRYkfsGZNoFgw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5443.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(39860400002)(376002)(346002)(366004)(136003)(316002)(6486002)(52116002)(16526019)(2906002)(8676002)(26005)(4326008)(6506007)(3450700001)(186003)(8936002)(478600001)(44832011)(6512007)(6666004)(83380400001)(66946007)(956004)(5660300002)(2616005)(66476007)(36756003)(86362001)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 47ccfNCe6yHA0EER7pCb1GRkJTYpM1HI/WFP2kM5fJB7leyoKdnoy3U4KxpI7NVcbcQ/WbbpI8UtilcHIEgdxzgjAcPgTxa3DFdTG8cvrioAtfKyz2yIOO+pS/nL+pWVDv8BIQbnTo64fAE2tBRQVTKKyycQiMieC5SUzuU7yjZ86VrAQwOOKJO6YirSP2fXIioewbcr+SfDR7ZOoA0Bhf8ms/u9FrteINE4Q6nmqf4n/RwG8B9/HQUqxAClo/mmTX+8nG8+lDxhq8N0iidLHZJLe+1AIwwKX/P1ZcWtjyVqO2Ih6ANccpEpeeuk3LRYRUfAI6NA6WiUDHWOLmRGM/8WMqKTwIRP+FD4sklnIBqAxCM85PKEL1PNEyQMNTLCWJ+LhsAzyOV1wacseIkEskl2Si61Xh4Vhlv4ukgBle5xZhi1aD3rirmpo8KPa18aREVsRbR/CE9hHkzUCPbkGhF0I9utBN9anTGHvd585S2kyCzivNaWGfYiEJ6T6OzyrJhmG9BSLrfdyRG6/lW4GzTdFt+ZBJ692xklV5XRgF4CAqyktBmVY+fiyIZ12oB/vFEdrjXY5zvJkMRkwdFTY1gl8wXjm5trnuitEq/HiGCep+y/eXHmfXO1DvuDO8k0KOr2Cp3PxzwnopvnJpdZfQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9373fc1e-5a4b-4439-1981-08d8377bf64d X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5443.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2020 07:08:02.7267 (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: jW1DRvjhhmEImCQDlvdhjlRKiJehzL2Ry9OTvHRWF+unToAj3I7eVJaizteX3rn0pBox9I8S9+Qfls88SMAJm/1CFMzWl70LPls25+ocfGE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5233 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: 414fd46e7762 ("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 Mon Aug 3 07:07:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florinel Iordache X-Patchwork-Id: 1340159 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=jqdG8zpV; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BKprr3p2Mz9sTd for ; Mon, 3 Aug 2020 17:08:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726075AbgHCHIW (ORCPT ); Mon, 3 Aug 2020 03:08:22 -0400 Received: from mail-eopbgr150052.outbound.protection.outlook.com ([40.107.15.52]:25506 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725806AbgHCHIH (ORCPT ); Mon, 3 Aug 2020 03:08:07 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JSXyyMRp5zAVW7cW+e1O43k6Vlujb7v6SCsaeSuaa4pntd9wJk5Xri+JQhPoWYn0NLaksTk1qy4vdlIxb8r+xhnA1ZuEAy3tWcnSQQULNLOqWOsetpsFIxoRqQUyxhAIQP/kAnurIV4bm06c25cCeJe35jDCbG1lSW7j/RHBwPaipuC+K37nxTLKAQKkQA3ExhWrEhRQxziTeFeMUOjqx3aCjZD4khVTVYzjBLGwEEmvRvc3qtbSRl5O5HZjfKLrMGygb7juSA79+zear1w7HjcbOl3KuDVwrkVcso0iM4cMZeqz+umA0nxUqQektnuxi+XhknH5mDB1GzRsV26xug== 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=Z5sCP2FZ09v7wBTcSV6/InXrAQGISUkMRsYfgNxsd3w=; b=WKqy0+/Wnf12Yl+4p6MFR140FQgjfyWsnXnzDIta+kpNK17FKdj2onMeyNc5Eb8AQ9t2UdUV40j+NKfm3CLY2lvqUDfXdSsy5rH8bRVgaAAlKlDMGMaK8owykw10ypSX0yP73+4ciTFtxFyckyLCJNMr7/bdfGRqLdolWTrbU5X1Ku1z/P56kEYXzmBU9kGRY3gOxZRiYdo5gBYA7IsWQruEjGIusaF/cqUvDww/CsWGpp6V22MGfsRwmCl1hXXkCJh5gFDSI6PxjzZGcweEwl54vmzH6KQk2qs3+cIHg47kXGtFuvayUF32Hk7gaXdlTHRPKIoMym5pod1yPcnyxg== 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=Z5sCP2FZ09v7wBTcSV6/InXrAQGISUkMRsYfgNxsd3w=; b=jqdG8zpVDmisGcJrSnqfTgq3NAjfLCRIIzMe72cppNwSBxqd6oSChkdNVb9dvy+aT7v6Mbi52z4NsahxEc9Qpfbfkn+/Xi+zywCAcz7pyrtP9ReAmoSMXqKnpczksMVb3brtlJHgk+bwmZWqfbwsAenvd6lU79cAK556zaGp4Co= Authentication-Results: nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB5443.eurprd04.prod.outlook.com (2603:10a6:208:119::33) by AM0PR04MB4356.eurprd04.prod.outlook.com (2603:10a6:208:5c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.21; Mon, 3 Aug 2020 07:08:03 +0000 Received: from AM0PR04MB5443.eurprd04.prod.outlook.com ([fe80::f0b7:8439:3b5a:61bd]) by AM0PR04MB5443.eurprd04.prod.outlook.com ([fe80::f0b7:8439:3b5a:61bd%7]) with mapi id 15.20.3239.021; Mon, 3 Aug 2020 07:08:03 +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 v3 2/5] fsl/fman: fix dereference null return value Date: Mon, 3 Aug 2020 10:07:31 +0300 Message-Id: <1596438454-4895-3-git-send-email-florinel.iordache@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1596438454-4895-1-git-send-email-florinel.iordache@nxp.com> References: <1596438454-4895-1-git-send-email-florinel.iordache@nxp.com> Reply-to: florinel.iordache@nxp.com X-ClientProxiedBy: AM0PR07CA0007.eurprd07.prod.outlook.com (2603:10a6:208:ac::20) To AM0PR04MB5443.eurprd04.prod.outlook.com (2603:10a6:208:119::33) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1464-128.ea.freescale.net (83.217.231.2) by AM0PR07CA0007.eurprd07.prod.outlook.com (2603:10a6:208:ac::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3261.13 via Frontend Transport; Mon, 3 Aug 2020 07:08:02 +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: 8df47000-d7ec-4035-e313-08d8377bf6aa X-MS-TrafficTypeDiagnostic: AM0PR04MB4356: 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: Al7neYpR5xr2cznbO6wfaTJYCsvsLy4k8F8xnRuBGB1yX7Wz4FUAQuIGkfpaGQxFVtM0tLFzREIZGvFSK3V6f7+SwVGKXtkWhCUDuAHQhJoS+W3NjoFsXhB8dCCGn00hVFDXijUnZZDt+X+DWBe6qWU5HrR47FvyaNFIa5ek4TGO0xTAZTQTkuAYNILz1Vr2YmMDRj/A9Q2TOetlbODF6Ed7hc5+YeqvuN2H9bPrhgDLqdGn4M8ACjt/d8CcqSHqRTa/RazBDOEnL5tjhS//hIvkB4AiyJiUNeZOdSWR07ziFof6KPxHNb8anmHQWtyWoK0jTgyDE2PbJl1pMIykOg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5443.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(346002)(376002)(39860400002)(396003)(366004)(956004)(6506007)(52116002)(83380400001)(6512007)(2616005)(316002)(36756003)(66946007)(2906002)(86362001)(6666004)(478600001)(66476007)(66556008)(3450700001)(6486002)(26005)(4326008)(8936002)(5660300002)(186003)(44832011)(8676002)(16526019);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: vsaWbhwutHTy0HRZnb9Z+SpZ+cuJownAS/G9MEC+3LCP6plJufzqPqMSfdN2Eena8XX/llSf0rel1MfYeyqpOLhGVfSXxMrc6CWgdPu+Ui823FkZLMUUdexgRQDzNYSNBu0Qkj96bMOLtwIN1zrNhc9Aj6Jrr4RrIwUGB+PLApBUH+NZ2jAHKzckYA9bV/odKDwxPy6aKrxedycJKfcJ9bbMWmV8Xblk59gB2oHh1GL1VLZSr1dwv4iV0g3KaGRHlfKGMrpyDGhuBddyzMIRTxouX39qbPU4a5S5rv2QLLskQEEFG8I0F0ioUBIP8Ug+idqOIwM/O/Gf6996V3vu56qDcUA1N5kKZLeO/8ubFlDAx6biYYtXJ3uXeUjEhUD0qwJHAwdBLWIg3z82gd8tF9zZ+f/FiuI3gz0eA7+LfuOh6Vm0phONvzGyzM8yVhEHQGW+AhyZtBfYOfzhAH1U39OlGovgacQEwhMusq7RaKupOQlbBoooilgMAE8mv6m6QujXesfL05Jlyn73HAszeixm22VNAJejDuqwp3j40ijDkR2xAHNNtn0KF9sBgKQIo62lXkPdPTs9LKfTljI+LAMHjKRn+G5dRkqbQmIquHFX1uFM9FzGhYoLycRjAwvh5VcaYofF+c4P4gSRoO7LIg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8df47000-d7ec-4035-e313-08d8377bf6aa X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5443.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2020 07:08:03.3563 (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: NWYWNoKWZ2NchPRKIjGY7fKKVeJsgPLW3GxaIbcLYlogyDdpG2nh3Gtzff4vD0uu/H8HgEfZdLoDwDhPiEuZlioaqK9garu94M5fjGrJ7hM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4356 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: 18a6c85fcc78 ("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 Mon Aug 3 07:07:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florinel Iordache X-Patchwork-Id: 1340160 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=kwxcYa7g; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BKprx44hHz9sTY for ; Mon, 3 Aug 2020 17:08:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726536AbgHCHIp (ORCPT ); Mon, 3 Aug 2020 03:08:45 -0400 Received: from mail-eopbgr150052.outbound.protection.outlook.com ([40.107.15.52]:25506 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726080AbgHCHIV (ORCPT ); Mon, 3 Aug 2020 03:08:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R7ba+hc/hPKOXTg5YtH9gr4M7NWOsB7qQZT9TQYpz1APn9XR4xr6QOML2RtsQugVjXu4Tk6rdbp5d6n7MV6T9oNN0tin5L3dcRM1PSWxDuxiNjoYHCvC9GqSlULRal3NGctAzbnCam1mmgaUPzHc8X+MAfBpVy/NNhUbSaQ55IXBzxCzo7DCE44n5Hw6j1tiss1DIVxCcCO0Jv9NL+A/XEXiwtOKXZ8o51CR8dWIENmrlSz9mYYBLZMSD7PgZ7kHpxSUet9B156FwPclSOpEPzWgQlTjvTzskvTHxSKLHCAY+IeG4cW2SAqvjfOk4a6ptzRJGvlxltsnFj//f2w7fA== 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=5FKqNu/Ojl5Pg1nVU7wPMXNjc2QV8IFxQ/zjRMykop4=; b=Vm/VyddnVFKgCVoA79dsKFZx1TrjIWcKCcdyOY1wUl1O+ZxNOtkdBr1ZiTMOHA36fsjm1dDaWbBbuADPNWyBskuMggPUrfAligA7FAcaO9tg+h3keDxXXAVXyGPkyu5lLYKjfp/VqLXBKedYyCPkRfbnnBrunwnVQi3FvF+OZnlZInfBvn+IOqm/mNA0l32VkrBzD4keVrVAItTPrKE/o1TCv6GkTbe/VOm1td1+d1AOsHOoUmvXHTKeyu6Hw6jz7WkWxATn2IiAcT99M8vojfUMiMD4trBpS3GzIEjVAx1U4x3qX+Dq9kGOS5G3QmztQono7xeF1fcsUr38JjSBRA== 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=5FKqNu/Ojl5Pg1nVU7wPMXNjc2QV8IFxQ/zjRMykop4=; b=kwxcYa7gNSuSIkxHl2tKvjI9yXAZI3iBGlEdzrgzMESNT+wuJXya4M9Ov4HFkkmvGBoApYs7x3keRNEcGFyO4IbnLzFpuwBrotHd9JU0dewWO/0hV3UQnHCxXS2BtgeaHo1Hk6BBU2oiC+7WgxDaHWkGdSujfEH+NvNXSYcLPAE= Authentication-Results: nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB5443.eurprd04.prod.outlook.com (2603:10a6:208:119::33) by AM0PR04MB4356.eurprd04.prod.outlook.com (2603:10a6:208:5c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.21; Mon, 3 Aug 2020 07:08:04 +0000 Received: from AM0PR04MB5443.eurprd04.prod.outlook.com ([fe80::f0b7:8439:3b5a:61bd]) by AM0PR04MB5443.eurprd04.prod.outlook.com ([fe80::f0b7:8439:3b5a:61bd%7]) with mapi id 15.20.3239.021; Mon, 3 Aug 2020 07:08:04 +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 v3 3/5] fsl/fman: fix unreachable code Date: Mon, 3 Aug 2020 10:07:32 +0300 Message-Id: <1596438454-4895-4-git-send-email-florinel.iordache@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1596438454-4895-1-git-send-email-florinel.iordache@nxp.com> References: <1596438454-4895-1-git-send-email-florinel.iordache@nxp.com> Reply-to: florinel.iordache@nxp.com X-ClientProxiedBy: AM0PR07CA0007.eurprd07.prod.outlook.com (2603:10a6:208:ac::20) To AM0PR04MB5443.eurprd04.prod.outlook.com (2603:10a6:208:119::33) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1464-128.ea.freescale.net (83.217.231.2) by AM0PR07CA0007.eurprd07.prod.outlook.com (2603:10a6:208:ac::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3261.13 via Frontend Transport; Mon, 3 Aug 2020 07:08:03 +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: 3ed018de-12da-4cde-7828-08d8377bf70e X-MS-TrafficTypeDiagnostic: AM0PR04MB4356: 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: k7Esdnz835KVerT3GzroYzeu+nvKqyOR/08jyk2zazF/Q4UhzEOUGLgBMfOmVLP1zQ6BXPSnBRuf2k873fdtf21y0eIUeMJyVMGgwsXGw+XEuGCixvwKdUo9vNHmgXbqXP/M/0RvqCDdx70qiSBNJNo2ryh9XECqDy80KM3IyN+cq4LBtQn1mvysApZn1+usxVXD25Eyu/M+j3iNj96qXO9HEFF+3wRFS4G6VGSywHG9vY6vq22HsdBW8jCEL3umcUZyKwzTtHAMeZZAdmyTxv4jr4DnHOOzFOylfd94pVhdB5eBcuZmAj3+3632AMmFlKe+siq9rbc58rafYxjURA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5443.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(346002)(376002)(39860400002)(396003)(366004)(956004)(6506007)(52116002)(83380400001)(6512007)(2616005)(316002)(36756003)(66946007)(2906002)(86362001)(6666004)(478600001)(66476007)(66556008)(3450700001)(6486002)(26005)(4326008)(4744005)(8936002)(5660300002)(186003)(44832011)(8676002)(16526019);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: QmMatqxVXOM6NQSdSza24PXmiIILafEtuIUVyv3ja7gFgVYQsoub2nNgIUAJL0ceW8JA0K+QBxjjdbqbgJ+h3xjKDXxbhA+I6LmYvCjUiHFiAIb+OMWKe58R3z05f/vO53ciDTIPE2eP/EASlkBxKZKXNv0okP9e30zMepKJ1BnfIe4loO8C9dp4pmjIh8ANsDeOGhBmLDFgf8GIUDbe6lXvL0puHtDS65mJROHh+amur5c9Rxd0YC9Bzzv+CkPEHSIBwD8498cRCts1r1TM6HztnHID0kgvoFq5CD4IU9pUwB03/TWPlO98K90O3PanG04I0vw8ZUMgeCXYEqi3jqnX2I7pcuvyWQ/BHXrE/1aNd+DZcDvRnl45NcZn63RLovL7ZrJPBEAJhtTIY9U5JZysZuSFya8Eo0lATY54BVsorss2dI5m8d84phnGYYMBNSyIv3ztW/X4Tzb5sEpwVhwzzfHTMENd+GNtTnVmzOjDeHi9Wv1vfzyOa9tAj/UvsNtc2RmL4YBAqSY7RRP0gY2NZXaI9ViaEaG6T3jj9oM7y/bTlSJMiLfG5iQ3Lnq9v4EYlLAB7xzyGXBxGJrApXslT7rgaXzcSHxP75Q9+EzTVqH8MM3MQkTpLFrkr747hNS+MjutA70t9TzfgVUaNg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ed018de-12da-4cde-7828-08d8377bf70e X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5443.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2020 07:08:03.9590 (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: aVz6tZyNovxtqFNeZU39GOIoRN53d8JLdhBE+oPMgp2lK30YrkeLo4W2tav0BS9nHdW/7p2xjuDDK90GSHnQHjIeyhf9+GwVj93OcpcFdQU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4356 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: 57ba4c9b56d8 ("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 Mon Aug 3 07:07:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florinel Iordache X-Patchwork-Id: 1340156 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=arcqXX1I; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BKprY5lsyz9sTb for ; Mon, 3 Aug 2020 17:08:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726354AbgHCHI1 (ORCPT ); Mon, 3 Aug 2020 03:08:27 -0400 Received: from mail-eopbgr150052.outbound.protection.outlook.com ([40.107.15.52]:25506 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726202AbgHCHIZ (ORCPT ); Mon, 3 Aug 2020 03:08:25 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kg7y+Zc5x/JH/xmUItkwkEy1sDI3rQxEAlWovCLxur8BH+38JROII/77NoLjU9IyTP9z7Vz5plaFe5fxjEoHNZdij1sfsXNTCKGpsoOf1k5LqR1ylbEJZAJ8AXQv0IkG6W3zWT6ABhZgcoTf0CvbQDDf3WN2WBwS788NVdZf2JatR/RX11nQaZC7mjfLN9Txh+yuz173ZoS8/ML0Uk0ICoCNnty3toxGZ1iTewUh086GH/+PwuCq8tZD2YqnzIJd7qg/I7xoqNvryWThSHOsxNFfoji27gVvpNMlVNDazswE86tdePNV7qMUF3OwLtMGXiHv4bBdf5KhoD9OW426xw== 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=PcZRj5mQvYa9BBQ1rLDtrN7ZRqFF3pXX5+pAz7I0/sg=; b=WIWnVAlYctfcGZ5C4tRDCybg7Tj0WHWlHz1Qo45gEpjPN1sx/TirF5VcT/uuzqw7QzqZNm1xxIlm36LzyLR0VvJIA4H7xQUF/qKI/0wMgonxoCV5zwSjPyj2tTUYdvhBB40qyGZRXwtgT6ePew+TvzGimyyPMJ1jfEi84q9H0nhFZWoblGafnAM+JeMHoV4gh1C9/N+edZiLIaW6L7h0QHDPba+AMKPGWoq3d/UblJPgSqk9lSzx+XYm1uSFOQl63sL4PanZ+jDpX1C/VCoaoju409/YRnFrqLD4XxUiTfvSgtMAbgh+QlixjyPAXiD/EbRKim58HPGZfVmFSD8oxA== 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=PcZRj5mQvYa9BBQ1rLDtrN7ZRqFF3pXX5+pAz7I0/sg=; b=arcqXX1ILRaIC93ZqJm5wGzEBm863tX8Av0gfEZlZFNdnI1/EhWWUcKw5H9hszBWsqmfrT8aDIp/w0TQrER7cMguE0Jn77rZmXQ4x0yT8xUEwXuLfbjJSQxhluZbk2mq3KH00ksWsO5BspnA/KLtV7etpiba6PiIePgtfNWR/0s= Authentication-Results: nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB5443.eurprd04.prod.outlook.com (2603:10a6:208:119::33) by AM0PR04MB4356.eurprd04.prod.outlook.com (2603:10a6:208:5c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.21; Mon, 3 Aug 2020 07:08:04 +0000 Received: from AM0PR04MB5443.eurprd04.prod.outlook.com ([fe80::f0b7:8439:3b5a:61bd]) by AM0PR04MB5443.eurprd04.prod.outlook.com ([fe80::f0b7:8439:3b5a:61bd%7]) with mapi id 15.20.3239.021; Mon, 3 Aug 2020 07:08:04 +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 v3 4/5] fsl/fman: check dereferencing null pointer Date: Mon, 3 Aug 2020 10:07:33 +0300 Message-Id: <1596438454-4895-5-git-send-email-florinel.iordache@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1596438454-4895-1-git-send-email-florinel.iordache@nxp.com> References: <1596438454-4895-1-git-send-email-florinel.iordache@nxp.com> Reply-to: florinel.iordache@nxp.com X-ClientProxiedBy: AM0PR07CA0007.eurprd07.prod.outlook.com (2603:10a6:208:ac::20) To AM0PR04MB5443.eurprd04.prod.outlook.com (2603:10a6:208:119::33) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1464-128.ea.freescale.net (83.217.231.2) by AM0PR07CA0007.eurprd07.prod.outlook.com (2603:10a6:208:ac::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3261.13 via Frontend Transport; Mon, 3 Aug 2020 07:08:04 +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: 8318a6bb-25b2-49ca-e25f-08d8377bf76a X-MS-TrafficTypeDiagnostic: AM0PR04MB4356: 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: Xnv/7eGCfg2wNwfJyk385ynkU4SvcCcXV10Xv8luYklOj4byNLneYm3gOTMRdqb2NDyair5Pi5NieECOM1PIHLsHOoW0hvC5K7PEuBI94BUt2FKRQ2FdikAlThPSiXsPgohbJaUPVXaF+t2PPF8UtHMNCYsPureNML/WKdfegiA/8LRkE3JjF/HjrYqlhZXvANQHAsleZsVNgsKxi96yp66jyekxxxOk0IHVasTOuXg6iw5J7vrTF0ZqS0Xvp5TL3EskxGLiqdT+wCqL8s7wGLA1PAPftgzZZvzJ+RiNiMkyJK9SpZa02swQ/qyd6NXcwenB+6J2fdc1p9Qs2OyXLA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5443.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(346002)(376002)(39860400002)(396003)(366004)(956004)(6506007)(52116002)(83380400001)(6512007)(2616005)(316002)(36756003)(66946007)(2906002)(86362001)(6666004)(478600001)(66476007)(66556008)(3450700001)(6486002)(26005)(4326008)(8936002)(5660300002)(186003)(44832011)(8676002)(16526019);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: yWXJh2mrO0vEAsvD7bquDGX/K1U/C2230uuP/v+WODm1UI3WBddihRstLUXgRypeuuJRDe9wDYsMsWFCqOECO/8SEZXJCH0OokW86fJmbSVp4N92tDa8L9lR0VIyCI2EE0ccZ4RhHywSTmuZbA44z3rn/H0rBMI0JWJzSHQxixfaaPLclGcuJJOxi1bFMo5Z4To/um/OzHNWSyGnFgOMfRDFBEZZNN5+nVYBVFK0sGaUOS9ReAWNCK31FXzgrqNtXt+dtOl9LZKl7ceb0blaNrNHDtZaW1Vhy6aXDfeS4YheCG1iPcPN95rqSEhXRBHCc7GOAFq+WyKcLTbDzIv+/NIQa8E1Ls0/E8yijhS2ry9+489QWZJLZlBnwROt2GR5hzAJTjZMbtTLF0jPjfgzy1QOi6glU7iXAgzmN6XuWFHMDoNSWOkY4jpivJktOAYTHrnZDUDwEuUJC2KI02mhfSxK8Mf4I1XGaqojBdIDnFoZiSGgIAHwPwULmRYVw8pj5HxmSVo5nQ7+D6JddrK+CGUpLUnLEVsa6DUvX92xnWa3ACgSmDrnLJxxsaajIk9iB9zgA+fhlPT55DwMhS0G137p7GBgTMOKTrlSFzvW4Ep46k+ieUdNFUq2szCZ1bGCB/NJEEbYCU0FNO6JTwolbA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8318a6bb-25b2-49ca-e25f-08d8377bf76a X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5443.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2020 07:08:04.6216 (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: VRcEpHGkGAfdO6nxqygHmb9z2gdoMREWBrEK7t0Q+2Jl6F2XsTROo4+vb0nyl3LDsM3hLwbE30bYzjvzwlQN4jsNQK1XOQQoRhGQfqSt94c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4356 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: 57ba4c9b56d8 ("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 | 2 +- drivers/net/ethernet/freescale/fman/fman_tgec.c | 2 +- 3 files changed, 4 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..645764a 100644 --- a/drivers/net/ethernet/freescale/fman/fman_memac.c +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c @@ -981,7 +981,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 Mon Aug 3 07:07:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florinel Iordache X-Patchwork-Id: 1340157 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=OkLFv+3l; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BKprd3YHMz9sTd for ; Mon, 3 Aug 2020 17:08:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726504AbgHCHIa (ORCPT ); Mon, 3 Aug 2020 03:08:30 -0400 Received: from mail-eopbgr150052.outbound.protection.outlook.com ([40.107.15.52]:25506 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726279AbgHCHI2 (ORCPT ); Mon, 3 Aug 2020 03:08:28 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ig6Y4S+A8e9yHd52F0Z4PogE3p8I2+FJLF607KxA238jFdDk2kD0gW3MxVPDf3g3Cu/ITwmMJnXW3lH8rKYoIxgwgdM6hdrli1m11vVkEL4xxCJaUI6AE6e7TX3SxyEjkSmtY9LxZooulQOH092U9eRoFRSrNpeP00mPZautvrvWz2ob0OzGq0Vt0ci7hiUV//vtl3cpTgTiGtX46WXtSbk9L0lSAtbkSegykB22+BFUg3D6I8O60zoWELNdbFiX1Jk+GdUC1ewzZzoDzwEqVNEDg/87Ni9Tc9Zn6PgEUSDu3uM1/YzXXxI3G5zcOo5Dp9O0JZ6nBqmRe60nWdQnPA== 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=uv7Sb1aIddJ4o0o7SJYBx/eg2HRonbYEfVA+c/wT/Lw=; b=DgtCPgeyjAJdQCPJTNPQy/5TbMHQFJuJc9w/lxf9j/K2AV+ZoHB/9ko80IDxbr5sxH/7LCkLEJmWldFSCCr8+ckL90i5QfL/M1sKjBCG6PMvfkZzq4nA5R8zZ6AcWueEK7mt16srvU36HgX59NszGV3wMqSXbjSpfXc6CqFNL2xfJbUfs4WbBNxRKVoWVTmMjvb+dIK3mptkwUCZndi7U8/jwyeN7Y2WLIq4Bw5evr9ZNQ7pX8r3aT9Cd50zORX88ItjsTWi3N2pdBh7uO4tBF23F5zD5yTzx50vpufhfVREUnJs2h/iKOjtXanKH9/h6olJze+qAvxmxXsboHdm+g== 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=uv7Sb1aIddJ4o0o7SJYBx/eg2HRonbYEfVA+c/wT/Lw=; b=OkLFv+3l4voDVljDivTXvwzj7f4HusS3ghiZPM3UrA5k4bVB7UYeb0TImjN3ylGFqsOFyqULk3lAwCD+Bk5MpKLdiV3FBI4tAiP4D1v4ANBK6hOHGF/tW3FI6Y+83mfHb7Tx2S+wZ7YH8Ot52sRv0ozOpiZUSI/SpuNjxbvR6hk= Authentication-Results: nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB5443.eurprd04.prod.outlook.com (2603:10a6:208:119::33) by AM0PR04MB4356.eurprd04.prod.outlook.com (2603:10a6:208:5c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.21; Mon, 3 Aug 2020 07:08:05 +0000 Received: from AM0PR04MB5443.eurprd04.prod.outlook.com ([fe80::f0b7:8439:3b5a:61bd]) by AM0PR04MB5443.eurprd04.prod.outlook.com ([fe80::f0b7:8439:3b5a:61bd%7]) with mapi id 15.20.3239.021; Mon, 3 Aug 2020 07:08:05 +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 v3 5/5] fsl/fman: fix eth hash table allocation Date: Mon, 3 Aug 2020 10:07:34 +0300 Message-Id: <1596438454-4895-6-git-send-email-florinel.iordache@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1596438454-4895-1-git-send-email-florinel.iordache@nxp.com> References: <1596438454-4895-1-git-send-email-florinel.iordache@nxp.com> Reply-to: florinel.iordache@nxp.com X-ClientProxiedBy: AM0PR07CA0007.eurprd07.prod.outlook.com (2603:10a6:208:ac::20) To AM0PR04MB5443.eurprd04.prod.outlook.com (2603:10a6:208:119::33) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1464-128.ea.freescale.net (83.217.231.2) by AM0PR07CA0007.eurprd07.prod.outlook.com (2603:10a6:208:ac::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3261.13 via Frontend Transport; Mon, 3 Aug 2020 07:08:04 +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: 62f7b1a0-615c-43da-afcd-08d8377bf7cf X-MS-TrafficTypeDiagnostic: AM0PR04MB4356: 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: DK+eYYcB/0VBuDgow0lGWYjJsj4n+JP9glizwsaNRGnREt7ZEE8D/kXlM7iRBULNYLyH1eB1RZ485uIBtI0vc+HaJkrTiJWkyrvGbQtbx7Z3VeTFLWMTyOhCTPrZcj31AS+eMNdmzVmSilaWXd+0+csTGZ4mfjVInuapmlMALCn3rc5OV1EunHS2w9YhPnvTzVKA4k0gf+5aOkLCajJVe6ST5UjhH2DToW2lcw+TGadEk47F00iN/+C7wrYhboCbW1nJQaH7eghij9CJbKbYk9j6qoHW4QD3B5RZOrYzqNvnWPpzsfPMo6UXzGssnyzYz3vN2KGdGeCK16CLasTU0w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5443.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(346002)(376002)(39860400002)(396003)(366004)(956004)(6506007)(52116002)(83380400001)(6512007)(2616005)(316002)(36756003)(66946007)(2906002)(86362001)(6666004)(478600001)(66476007)(66556008)(3450700001)(6486002)(26005)(4326008)(8936002)(5660300002)(186003)(44832011)(8676002)(16526019);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: vG0DFWvc7ldCK7kOTT44UU8tRx3vLMv1QKFJHvk9c//WeFwGcm0uNYpP0WkumuVSpatIFbnutNBWyTnDbtIUyKgKWXb2lflJYjmPrTC1rQkaQyjvAccgJ5Pb5dKXvfP7JIUvYe6Fq1GsMUuWD2YnOb9LuEhJG4NJmGLjvoiZQ1cRJ5Oja0V34kD2XB8xzu9E7P3H6srjBdcdaEjLrAkg8gUGSV+KsPR+gurkFyN1TJ3wLXtAryz89YDdkOSBEWEBRXDrqBNQQtS0fnf0xgoyx7UVYlKVK63EzcvzzYgFoijHzLdRqe94PQ/5XZB0eqgXGozt8q79SmDUQNyxTx+WcHCCGwDDgAcVq5+cw/9idelJqAy8QAXqqHylymmOyX+m5FQ+YFAaaKg/eSQxcCfmgcwEC1R4xPCvayZ4vA5CMsTIBJYJaEve6UOwHfElPkOAhV5UEC/f7R2C4043sj2La1al1ri8ncQFRd3dU8f4DOsDlyanGqThA0+3jDrWttuCrNxCddrEXs65Ep4XhG9GzevrtP1lyK9/mlIyLCpSLmVnErM61M01HZAhO9YH8MRa9ulbYc0hc2/gVDUTJQbQUlzV1Y1a3ro9Kz5v+37/moadCcGjJj8fZtGRme2kDW1CHpAWeovPYikA6zsEC1OwFw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62f7b1a0-615c-43da-afcd-08d8377bf7cf X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5443.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2020 07:08:05.2622 (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: HZcxHmXo888SOy++VOgF81akj20pJMQFnGv6RNZL8aj+wLDrFWxznXVT6/3QXnLFh5dXeCTNKRt8regs5oaHJVbESstOBtbMooI/GZknOwk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4356 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: 57ba4c9b56d8 ("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;