From patchwork Mon Sep 27 11:21:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533269 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=hUShU61N; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0cq0hgrz9sW4 for ; Mon, 27 Sep 2021 21:23:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 20910835B6; Mon, 27 Sep 2021 13:23:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="hUShU61N"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5808383603; Mon, 27 Sep 2021 13:22:23 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on0601.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::601]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D84B283264 for ; Mon, 27 Sep 2021 13:22:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gvUsQsFzmS1heQM7WRCNLEjpxfVIvlgxQ7PPx2cDRihBkeIwsuQabclVedHdROJtMQVnx0vYi35JlYvjoiK43hxH2kWaTXcv3oOJJP1lK5UtQ/Q1nCF/vYzYFguYLmmeEXUdC5OuUj9LeLt/VU1Wsuv/O0+DW2591pzMDdNgNeV4D5kV3z4uuYwDjrXJomyt09iTdRaBLjM5ezkMSQxIsQ1vm+0CFQgE4SfYwX1cgUpTvO/hFN8cMvXxDjqb6pxvRLAUL4Aq6gVkg7C41BPNVCJXJRaPUaSztyUJAjpKZhFDUYZsPx5ZnvDaio+yU/8YRv2FQD1/VE37Pn6s4NjAlA== 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; bh=XM55CcH+8u2qCcbhWvlHXcOGbHDZ0ALevnkyzD7qMHA=; b=gVyNpboYCR53eG2DcavKmAMaHZ6yGSBKvxIVuL/mhxI/JeGCiJJbKPVFlLjMIAKo+0ptvZXDdkrzdS8X+e+57VUre/B5S2lu6JzjyKVlSlaSHaNnDCFhKDxKmNqKkB2IXrGpFwmQxcg3AwFwK7oM7T864kPpOwiGPDsqOnSpbofh1InDP6kLZHLEKiURhPtPJXdeef6MIwAjw17ZnbBE4Gb/KKv5/vtdnEFmKLVv5TXRxsvgHydp5MXcGvyEpm/Q8okufMW9Sh55fu5C6CzFNXXi+Lh8250d+70wV1r/PpziwTDoynMxWlDVyTPSahmpBoe2TAmTJ4mbuRFbCNBh7g== 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=XM55CcH+8u2qCcbhWvlHXcOGbHDZ0ALevnkyzD7qMHA=; b=hUShU61NFHjM5TQ9uFoXVRPRIfl/S8joMHzj+chEHkCmzDZmRQQhs/Axn6x8VL0IXgebRE+1yi98wRUOJdIwvO+V7xM6aVLgnXjQbwW+oJhffXArvFYxJjYE7kO8m5RQfIA2QbLQk5P8b6wKqs1hFKQqOv7lL0DC/Ei2JVU8kVM= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR04MB5503.eurprd04.prod.outlook.com (2603:10a6:803:d1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Mon, 27 Sep 2021 11:22:17 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:17 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 01/25] arch: powerpc: mpc85xx: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:41 +0300 Message-Id: <20210927112205.301876-2-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c1175273-44ad-42c7-e972-08d981a9102a X-MS-TrafficTypeDiagnostic: VI1PR04MB5503: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QeZ9jhOyVtTvBXAuNWunHra97RPlOgwOTeS4RbPAkcmW/QNyMxQmdl1Az4EtyE1gtZBQqWpCDkiipNPEl7Z8L5hgtGIBLi2fdU/9o+6JvZHmv7iMaRTIgW4Bty6zYpNp0AdxaP3AR8r3mi38iGbWJgK3f5fTrMfJjhrQAGp/H/m0dxG5qAoGnFeU66vpti7LS5DFxlSKsBdLLsvKFp6bQcukQfpfXcVFdtCUXlJqd1SB6cTQadFsaaKRc3XuqeLXdxbGvncsRerro/6TTTmjB7Ist12el3Ti16CMz8Uu/u4LAxYO4l5wL4jV8Bjbg9G8A5N8R3QtBxz57u7cYsOOfUmZ1z6R38v4qbFO8aqbsQ0gGBlKwZYoQ4w5s9uA5lhD1T6h/uPjHT1AelVkZqDXLFyEv5DEgIZRJlL08OJZnIKG2Tx8Q2ShtUwj4FDcIQICa3I0AW526tOGHqBmdWEOx/uSaJmhXHd93w94oV484QwjbmifOSjutrtRDbZSaX5mdvb4tLL6kP9G9FXL0CCZKXBMpiGe3BFG2Ax7nm6KTRWqLci/WZs2n6NwjnKfb8j3OaNnmV/ed/jW2WRZgizmeTazB10zl6DcbmqPcgA2CceQYNwpkoxtxfF8wOM/askDkOaIHzo3SqTZH2x82PoCfLVoMncIpyocYukWCIrudOynbuRY8qC2xqZfX91IknGEEKu+o6X2h2VDWXaTkHxHZQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(5660300002)(956004)(6506007)(52116002)(36756003)(316002)(6486002)(54906003)(83380400001)(6916009)(2906002)(26005)(38100700002)(66476007)(4326008)(38350700002)(8676002)(44832011)(66946007)(1076003)(186003)(8936002)(508600001)(66556008)(2616005)(86362001)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aBzC5S+hP43w5R9mf8sc4kRHYRv10MACpCT8UUpdY1Was1BBqCXdInhadeIsidyZJWqA32naw+YKAEQ9Jehi36RKKPmvrDuvELJFGphClR+eT/KieRYThHT0t2/IbvTveDOik4SzPTpzcVZScrP+UDHJuV8e+A+i0AWhClTYN9S0LLdI31S6vhE4hKx16FTE8LHVJerADs/rI7KCjbBPfnFHDL2J7MSRnGDS5FmniWKLN9Ax2SdH7E7h4iDqF1lOt3lcxUvZemse34rQdR6CKyFFeWtWuH47ueE1MFHWuve1IJqLd2RCsLqxe9fzSFLoAaYNDAquwbqx73ailOZNWF2N25O3MkWX1fVriiohEAUntiStyk9JlgkIUrIfHYyLfYIzJc+mwCzqdm/8ixXeTxDebtbFHkZB+mIRijfoCka9BHD6UIV9ofKDV0OxGzgEUgU00lXuiGjxts6ZlIHlO2BXXR3/Zdefvlo9Bg0I90nUnVpyQDaHrTnVNG1BSYJn51tclZ7ROpl6fVcWRBGuQxerqTRsak6L7Tpz8l3oFj1vCAO+QlL0VuT3nxCwdAUDs4C/0KjUWXbd00S2y83iab2omeJdwvP5NL3TwLgT1MB7M8adr6jIH0aKEB4+q7ceq9H/hPCQQfQjzZBlM3UMXWRFHbFWduq/EKMEphpnWTnGL0mqvpO2kWt0jetAIsZ/ZuZM7fcRPdn6sGm62xKIB6ZTBpH7ccfNu7jt39OTOrY9Jev0Lq3TGLoL2EvX/nvFjAH0ewkkzshm70I/hRmiLC4rLMNsD8g0H7HhTiuyI2OTguAEJEfKuwnkXOFNnZEOAFvwT+lIDTfjihRVvueLX57PZ09MQXXNCVeqNRiDJ2EgNPzqD0gPf8ZKPvEWucFuwGfTRebWkFCnP8b/J0YNZ9IKYX6gGT50zNljUkAwy0rwhKAVgz3tLEoAG5b+pSDfONZJ/bNN2WKnF6U8fHiwfkjNmix/5RSCzdI0AnTDA1FJNCYMaSa12Favj0Mq1x6cj0p0lnXpDvX8dSUcaOV2LQkA/F+r2fS2yTBMJF5YHTbUGGqero/QUlN6CQVkIaYMXXSVA2Rnyom/jgUNDgkZepWSC7Sz2DAHAOxHo4kHZyHdJgJrw2l/gsR+MCWvXfIhVHCwbOh+jzibLm0oomEl55FZICdjlnxMhgbCx0NvCkWREj0ov+yKNTgGasXGSOFF4SRO0KCFhEWggAMbeQEvn1yxwNkdCYekS7R8HwCjHrI0ebPgvUCsQOfdllJLr7DvfpPMqpvYj2f0AbWC79O5JOnIzzgJP38JcmkjZpCCjIC3MB4aBIiSoEOYY58cN19S X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1175273-44ad-42c7-e972-08d981a9102a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:17.2138 (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: z3KLjSdhftNARBx8oJ4m429Azckqww3HgKoz99GVaiQp9wOdeyLwSfCg2L2TRPOJWpljeQ2LaiKBxHjAtj+Agw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5503 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- arch/powerpc/cpu/mpc85xx/ether_fcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c index 3c4eb1a7eba9..1f6f55707321 100644 --- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c +++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c @@ -444,7 +444,7 @@ int fec_initialize(struct bd_info *bis) struct mii_dev *mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = bb_miiphy_read; mdiodev->write = bb_miiphy_write; From patchwork Mon Sep 27 11:21:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533271 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=GaI1vZVw; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0dP58Myz9tk7 for ; Mon, 27 Sep 2021 21:23:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 928EE83632; Mon, 27 Sep 2021 13:23:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="GaI1vZVw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 126FD8361E; Mon, 27 Sep 2021 13:22:30 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::60f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CE057832AD for ; Mon, 27 Sep 2021 13:22:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TVOdAckOsCsxASBnF7UNHQMZEIyg5yT8En1ewiVmaK3Zk84HlQLIyNaVVNdvWemfiNJnOjLf8GYarRuPC384qzEgQBz4ipoWaO1ZfYGGapDrbdEI1LAIaiBFvgUubw/L77hrqSc/89AYtqedBjTAbLPpW5+NHIF28pXFCpHtUcMTqxeQOpuEK2nHy6GDAacenoCGRAeMnNyBqWKKJ/GxLUHgijzwE+wVTby7igAPWQ+zUMNLtF43qAr6U+rfSzfi+3ZzjWCFcBWI1LL5WvqAyxRQdpydsYFr2Oae6Y7NGbuLbM+Hc+fN6lqSUnigNh7bDuBuh93DYdFWWjQPONpSQA== 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; bh=vpLsH1uhMR1zGiy3TwkcrmyBe4BnsZZvBjGDv1ft6YA=; b=Il3l2v9eKf9rctyKUowTzxW4IYixxNga0+OJ0k9gzJbJ5AeGFjJ+qVY4TvFwKMlCFoVcs8bWX0TobLsUqEU4uapvnAjm5WnE0sUgWCN9IiAPfINGdGiQZwOMMs04BWEZlnfoInQNQCaOcJH7anvU4ZzkFu/d4K/ElnQTLoBNwp/RwOfzR/55oO6xPU5IJ3afiw2iZjVgY+okGl5oJ7Zfh8MeMe5g+03vGFptFc24abF8p5vD40PKWhJ283+x135+iMPnLUswnkx7q47H0Q61xovJztGDr6JB6XkrxUX5DUiH1r+rNdAgSlM/4r8F2BCoN1ACbG1XLzc3/CsXpLXt4Q== 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=vpLsH1uhMR1zGiy3TwkcrmyBe4BnsZZvBjGDv1ft6YA=; b=GaI1vZVwb0z33B18/WjZ5KNjgMVxLlTFu/DSjDxwNwDBagItQPD5kq2TR3HCIeLIHBW2pz8SZqy2CsrDJxdTTkLJoy6jYe/bRYF7d2BRAoGP86qnKt9dS0am5WdS1FXnimdmzIXhT1HDZJAocpr1P+ippheMI0Ljw7519FR6bvM= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VE1PR04MB7328.eurprd04.prod.outlook.com (2603:10a6:800:1a5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.14; Mon, 27 Sep 2021 11:22:18 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:18 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 02/25] board: gdsys: a38x: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:42 +0300 Message-Id: <20210927112205.301876-3-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09f62f6b-3b82-4b97-1120-08d981a9109c X-MS-TrafficTypeDiagnostic: VE1PR04MB7328: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nwdhs1CAwiovssQQGVgplTHEZ0EymcFOpJSWBtzZByLtLKI3LquGNT3/V/RP7BQ7xz9LpYABfVQ7LNcLpOjLjoreyPDT9fvhUjbWwFaArcr+/Rz5gNdJjriim1rNSggqRwC1tD31i9u7Xr4ldSEjskSVRcgpMIa05xkxBP0OQlaGfPg2BcsOgK7DB6cmMx3d4+CIt+R8WNuINqMKaH566YEZar4uh/sTYwMDrpQXaypq20S5IPV2PUtia7+pAjiUShDNXh9OEeRfa/jAbtlhk0tmzt6IkJasjEyhM1CsfNm/Q2Nf5rEa3g+9491OiIdOJ7U3s7Wyx9MlQaL8dDvQ20sMTEzszxeoiozM2V02UbA5/UDCDzSN12ojZ8SiDTL87tg+gQBMnoPwR+kfuUGl734c/kbiA70AZjuVYanyujfCdDNdpLJqyUXSNmwBGsPw5TtNoX+rDb1ZnFKYKXFZ4wwgVaV9hAvv4iCCgaC9w6xYdHM1gsbqFhvEnLYJqERwFeuwvq2wkMRTDHZhcR4Lj+/650UVnhcVpgP/RJZ55TDpZj71T2tQRnreCa0PcOKAw8Iba6I+z1PruRuOClXuyr27pgd1drFrly5wSFccMyyDd5EXfiynt/HmHPkbOocCBnioDQVfezbzShK9RUgS7ogbkStirtjZpO/suk9zvgsGUFxFX4n+hUbLmGZ3Z4J5NZOtf9DE5ltjEnQtnOvv3w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(36756003)(316002)(186003)(956004)(86362001)(5660300002)(2616005)(54906003)(52116002)(6486002)(38100700002)(83380400001)(8936002)(4326008)(66556008)(1076003)(66946007)(8676002)(2906002)(6506007)(38350700002)(6916009)(26005)(6512007)(6666004)(508600001)(44832011)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 515+euSHbJLUWgKiwpwUP3TalcNqvIpqlw3AafNBkb//B8eeGc5dWkLEquc8vrCZzvQ3XMoyRnM4n0vM6YlLB21gm69rFKozxKQqt0YfdWFM6QmJMxK6EhLNRqNB1afRV2UF5/EizFwm7Djg4RN7+azvcZHr0UogGVO7PNzuICfRUTmlS1DmSAR+z5KB1Q2Y6Pavcj+YYsEgSrSSTJsmAfvykkIDfM3njxxE5ombcS0t91SP9aWAVW3D0t8UWJ7rMjRrEWPLJjvYSPCNA0Fr0rFUv3omESdd/vSpcoNcFj9Fny4pZJuEJmY+Sm09qy4RtI9x7cEvzIvOTMHAhU0J0ZGAu7InZDKo7LFPE7vF5GsM7O9Q9DRO1FnaLWF7rXvglhHy5MJNZZUeHT7kmOgiAfKKH5iyhW0RgDng5dk0i5oCJulNeEJqdNgMuRl5kyhMHWOp77jyoOFqt5p1gdp2n/wSP5mtcQ1sdWijL/iQtG1ujTtu5W8bAwAhiRfmII4/uZ4ycx3I0RkPnPIFZRtJTTSgW3GeaVZOA3sbvXB9QlUXjDtS8/a7W/ENdqVj5MAI8nsfRtVjzKEOPm3+w5nCoB+TxUkA2P9cks16U1jZGyIbSwMUWD+Y8R/KvYjuPfKWDiISuPfTGwOxEouP9vtBs9Ps8YHwFhx3Wlv7JOVuFDQrtWuuBNTskkD53XfTYMygE8ro1O1ApGC19wBQ04tKNuHd7Gb7pymmUHEVZceBtM4vZ4AX/8h5sclZ/qo7NWGXrKUslPoXN0outWPS7rrsK1mt8KtAj5YSqBt8Co4gwphBBID5fYDqXkiR2rjjSG8WCHc7GWBqXCqg4BIjIJbu2OyIuzq8iTxgmf0zj3O3c8aXK5Q1pespNZfGnnUpIhVE5Uxs83vLdqgV/1Y4vs+fBr31/o++woNDpnQHk3fAszh40llXYX9DTITp2hT7iacyZYqisZiwFqg3Mf/0YYq3wKTevpcw8+3HQiUN6JYobU5Utit/5V5CXrlq+GDXQpaTn7tZy9B7imxQ1Q+cJ3NZs9DyIUF0MaF/WUyNBQ/Y4yEEn9XbRugggmk5Mv7oiW/AjrsrVHrFKQbC/xaIzMXyr02Hmlcf1eKG4vL+fHCBYYqQFuZRReVKP9tgx+Pye7VHzTSGHMLhGGXVLFbtpdqkg+9WP0ZCNC/Br5/9kUDfxSz21x8Wu1kVUaJFdvbheQqhQXwDEYkq7m09vUxkZDUpkGBDHxVxSUWOTAQNrhE3jPaYAbhR0CXqbtqmNLWjhFTZmEyAFNpiuNfMHM/EzHTJeilGMIHKc1sSTz/2SclrEX6Zkg3ztgmfwoLkkvCWcB/w X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09f62f6b-3b82-4b97-1120-08d981a9109c X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:17.9654 (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: HTKSBjlzzWUq3nwQvJa6rnqOukvDeC0+N9APTnaHvpYDWHNN+jwRrVnqOpO2AChnbqLz0Wh4NZX6nEgeM7hALg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7328 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- board/gdsys/a38x/ihs_phys.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c index c23d15092144..e09c0006b76f 100644 --- a/board/gdsys/a38x/ihs_phys.c +++ b/board/gdsys/a38x/ihs_phys.c @@ -110,9 +110,7 @@ int register_miiphy_bus(uint k, struct mii_dev **bus) if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, - name, - MDIO_NAME_LEN); + strlcpy(mdiodev->name, name, MDIO_NAME_LEN); mdiodev->read = bb_miiphy_read; mdiodev->write = bb_miiphy_write; From patchwork Mon Sep 27 11:21:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533272 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=CxVxZ6Tn; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0dh2ZlTz9tk7 for ; Mon, 27 Sep 2021 21:24:08 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 06CF483623; Mon, 27 Sep 2021 13:23:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="CxVxZ6Tn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1DAC783613; Mon, 27 Sep 2021 13:22:33 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::60f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 867A18348D for ; Mon, 27 Sep 2021 13:22:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jr3987Xe0lKSkhIeIt+cRvu7BnvWBOLFaMdJLT0S4jionqaqEVYJYeytEBTYJZ4x83YZZWES4BlqSS1zSSC2qLlV/lelPXe9QUBYk86d04IGOOz1TYRJVfywnCC5Wlepv4+buFOi4AUhCesMlxgKP6EPVqiwhunTdVqFy801KUw4bpyBP84zPxvD2qjz4mRh1HT+s/+PNA0CY4biFb/LAei90xiYZsS93f9IeIaJUiC+Zqlu4S41McWAVMSJMXRdiZ0l7fk+WOMzWa1zoopELxqYCsis5yNrt1EvCrRURmTuSPRoYFdok0ITRu/oZQ++SRDenD+PJtK3f+8HE/Rzng== 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; bh=Dp+OHx3b/L7gj4xD/qxkpUMEEG/TavQxG6zaYpyxsbU=; b=e2Krz3OM7+WqG49XXMHYaep4pN8UXgWztpcjRFQDguyJIo6gTXGpEvgABLfsZDSUUxkMeSsQb14cTgL9vRfLPrFCOtKjEDk3XD8tmPbiC7WrmT082h4o65DZ2mu3gQyhBWgXdxhR+/vM00HSH5HXimTVEwARe5lKZhE2ok2BYXAPoEfZt3UK0wjZgowxCK3SpNVNcJEBF7LWfXp0AR3RHphqZIYSnf0CJI6dxN9kknyDZK8SElkwcNESeWUeqtRO4xS3D8NZ88Y92n1lXVpwS92M2RuA4CP8POZq8xio1qFaw6fkZmHe4mc6mnBGfckukkXDVQFvuwTBj+rb26qglw== 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=Dp+OHx3b/L7gj4xD/qxkpUMEEG/TavQxG6zaYpyxsbU=; b=CxVxZ6Tn4o8c6BFN8JaK7r4D98FYOMdFldwhBB/gDsceVvkypPcsaj593ltyXEsgx+yaZfXDzHlEEbPbmPZ1v5wf9f4/jKtx0MYt9lbRs+Kktnd+z1xl4DCH66nL93xaS7EcEe+m4noZNZvUXPaP2rirTO8qh2hCOOJ7UczyJ38= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VE1PR04MB7328.eurprd04.prod.outlook.com (2603:10a6:800:1a5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.14; Mon, 27 Sep 2021 11:22:18 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:18 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 03/25] net: armada100_fec: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:43 +0300 Message-Id: <20210927112205.301876-4-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f99be128-c9ff-4fe3-5b6c-08d981a9110f X-MS-TrafficTypeDiagnostic: VE1PR04MB7328: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bTn6kVKT9jBwfIynX/RR3VFPZIqy88UAH5fXNPIzpvCbaGkP3NhJRqZ6HwqXeh9OUn8p+Bt466PyvjJVSztqX528rreoR2eTyvuwMt2L9TDDT3zdb7/xqP1mqJsu28NSTmS997MfZykaT9TxUvI0ZjS2QP07GWT/d19bQnjkpEKWLh3mhkdQJ0/taRLkJbVLZ+QqefS5oypzOivMRewhcl7K9aC0UxiZPwV3Z4eBpF45Mo0vKx5TT+5oLIClVGSzPrgem0KqLh+cjAxyr8n4enrKnUHgh8i02gTBhzzzIPMIIziKX7+/wFWszScoV7Cd7BZrTsSLyIUtFmnJcBXSIo5bFsh+DBhC++DMwxqAwmiZSWpobn/lsly0Bdf4U8uAsA22ShCmHUcQgI40/N9v7sB2xu2Hfe4ze5d1/g6a7Nzm3SX/oV3MvdGg3+9ONgkcfBb0vByOA4yx+dNWT2LEM7oK1LngWBmmPNq9IK8Lrg3Q0vOBh70MEHq860NLgt4dDRXzf3ZkGQVfMzTKWadx+AUpkgoRIg1EsHuAFrPds2F0hZRU9s8XUuAhyYiCAXF2Dnud2JTvMFOZK0gPO8FU3Ymo6G1WQ04rKIOfPGARp3nlrulTPNqTH3BVTZdhVudIz3DTK7YUuGhTYm4l5ph5YNtE7Mdlhme24W6TNUUzFTzgF0lCVvvERxJeUETzrGpPnIiPIdeA9KR8qzNEd4WPGg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(36756003)(316002)(186003)(956004)(86362001)(5660300002)(2616005)(54906003)(52116002)(6486002)(38100700002)(83380400001)(8936002)(4326008)(66556008)(1076003)(66946007)(8676002)(2906002)(6506007)(38350700002)(6916009)(26005)(6512007)(6666004)(508600001)(44832011)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0bvrL8CXPqBP/gYlNLc+iI2O4fadqfPBuY8LG2sZMpRIhsrbT4g9IhcdvO9LkldBZx5q17YNg5WhFDcwmLgLiWAs9uUZrfaXNFHANSUFZUDfNB1o0Lf+c/GftDqTcFK0akmTVvNGNerLwkhSTKMhaMFpaGYpi5QMzdU9Ht5SqI9aEx2GfLvleEXSbGugZJj9WkLo7xXZxNFWmqeal5mSneht6dZHsIDbMTuiqocpJgfhAQ8mboxC2cThsbxOA/3yo1n0lC5XLczwLJUBQBJDJWkgAnpJfaBFqby/6z8CitcaL9eaEq3pmRQDPNrS3WcFP1MC7Ll2Rkk4Wtknbs0atXHIqp7ZSZAtGszcryy6ie6kxB247sFZoWcXNqnMppsDDIPJxZkS0hS4fhHiVzA6bgmbO9Eexra0pLmUO78htKB4ZDz8TSWuiNl6vpMOJPsp77n8VGL+xWqTAWCxSqOhWf9yfY6vbrj6KEuNTThy4F8eQnGGc99ZMkItz4lvtm9LBFf3cZo0DODeK4Xt69SlTYvaKIHLv38MSc9/wvdmVCwpYSsDQvdgMEbW2fg1JEOzplo3xE09EjP6Eqp9rm1dOBR79jUCzrYsQenVWVnVVH8jSsNLApNjKVo8OpGnAjAkt+MPY9PHE32FpQiTfxR2iEvctXMenZ63FiYgzLm2OIWr6p7aV2AFOaeiKpS2i/gGulzSz1hpQaKUYaFZwaH2XcjwDg2dsWi0NOBuN8VMBg/1LBM2gKq25vMk64ES8TrGtY5uzGsf6EEZshIhrP0CaIc3ydETrgMcfpGog7cQZIX72/+kKFoM4WuCFGy1hfqEpPF0iXQ4Fcef8zFgW2kR0YBIjA7s9AhRhzqPXpleQPJXs5gQf8492DPT1ORISUV3ydRVDuNsx123uASeZKBrYN0IX0kaDibi35Z1BydRGwHtuQsHQrrSetuCh4vOPX2ULOOgxNiYup0usIR7wIepyP8XHbALkBed7vT7R5vgK/t20jPFJWgSttj0Dxg4YDruTM6AS26+DOSsb9Cr95sRPCa1dZbcJNmHYttPy3MWnfhqpYrfkxu11mTDEvFa1ClitTd8RRkUAr4jsIvJuEl4j/dwxn6ySGEcbp2G4OTAjrQYzpAOlrW+oQG9nVZgXaqkasdtwho15fMF0wKuP4bA849bdFjWgpVTPXxitjxl59bdOiwc8tvWoRk2jmx/L3mhZ84O1LE5ngziZn1LGZoA3BRRhpHyOMDbmNSG50P5a1ZXOi5lJFLdSoIvfk7OhX1SrpTp0F7q7zXp9SqeQCzNCZpdo7TOUPTyQKo324ug1YDOVSjqIC4bZDTi39RB5nea X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f99be128-c9ff-4fe3-5b6c-08d981a9110f X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:18.7090 (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: xh+8+pqOSjyyepDGdDebyVI/dV6aW2fZvZ7+KccUbsKROL3esEaYqdndnIkoOo7jwPs0rBuLO00Cgo+DOBx9hQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7328 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/armada100_fec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c index 018891e173c3..5d4b90c6ba72 100644 --- a/drivers/net/armada100_fec.c +++ b/drivers/net/armada100_fec.c @@ -717,7 +717,7 @@ int armada100_fec_register(unsigned long base_addr) struct mii_dev *mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = smi_reg_read; mdiodev->write = smi_reg_write; From patchwork Mon Sep 27 11:21:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533273 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=RAKHU5iI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0dw5N4Tz9tk7 for ; Mon, 27 Sep 2021 21:24:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0B0B18362B; Mon, 27 Sep 2021 13:24:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="RAKHU5iI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D958A83264; Mon, 27 Sep 2021 13:22:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::60f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D8C9E835B9 for ; Mon, 27 Sep 2021 13:22:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VwXEj8mJVqYic9uQzhc0/mX86jMEtnUpBb2Efg14i7Bjf+GBnAqKtbHTzt01K5GlQWxv5K1khhDe2FF4/A339eVOGkPzbbAJyutzJIEY68w21TpaPPteOhcQsVfqHh8HOejytBf5Ki4usIzPdyJiXqIJ97TZK4XSP8vF0jwLvcTaOe0E6mFXLjWZlEe5DWx8hwBDE2pguR61J1ru7PJnBfK3FiWbDW9RFgsqK3OAWnqW/YPekUaeGzCj1lM7xI5szyf0x4px0X2yFBONsrS2/gke4RFxaYYTUL4QrC9JAWdtuu7GYqvTvk6eniie7e6ktJI3DQRoAD82tnPr2qJ3WQ== 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; bh=jqBOC+bzsde0ckrq2ibCylZJrA4j5O9pQ7m972rV+U8=; b=L+LGuDi1uJgMpyGyCkNAHvzpLjNIewcur43qtPFX5qwIsHCbpPTVeZOjRbRDpjMQZSO5wgTQd27MXvYHted9NFc3/D39L0s2tLHjMUTAOns5L6CeLYAcBorc19R3ZZx9deEkezX5h/f7sqU8WVMw0e8mhTKY/3taC8lPvbesEosBXl0NCNS829gHja/deNkfLZPIx6d93p2iAWyNJbxsHrjUOM0u2+OVkndQCeDLy2ahFkK7CPLmolq0oiMmJePjBbBswK9n1whxEKZpDHbC1NBhiYD/LaCyuQR37Y9GKNmlMW6oZqvbQ6cejOH1i9d8YmFLSD4kiGdQF8ZAgi1f4w== 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=jqBOC+bzsde0ckrq2ibCylZJrA4j5O9pQ7m972rV+U8=; b=RAKHU5iINgVn2b4ECUMno8BhG8bMQ8hVSK7H9DJDbaizQxNtrB7L2ks14lptpCxDveAhK3Ran5uzL4ubkMiuDHpEFzyckSShF+mnHIK4KS8+FhYv2zKLPzQIBD+j6AHGw03b9E5h7hkMyndRVDa1JCgy7+1cWjhOyFCxFfFy7vw= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VE1PR04MB7328.eurprd04.prod.outlook.com (2603:10a6:800:1a5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.14; Mon, 27 Sep 2021 11:22:19 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:19 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 04/25] net: at91_emac: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:44 +0300 Message-Id: <20210927112205.301876-5-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 22881337-349f-442c-050f-08d981a91184 X-MS-TrafficTypeDiagnostic: VE1PR04MB7328: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rbf14CxhBdiIM6hMVh3RrqZt9Id+5Wm7kcgXL6hKArdLNQMRs7+3OfzEUz26OKMLITJ5UITPBM9dtZIUE60ybUZS9Bx/IMsOe2AugT7b8+JGL+C8T8rHdz08Zc6I20mMewirD7ZOIWnriv3inYIAzq0kuoKlJFvXfVdf6L9UaHB16uj6DTW3XFh8PZTwdiTFOF8ful270Iz8/XuKQBxkxJlgk9Rnb7yUWhEO6G8w2/7u8CU+Sv46zkvhQhzn8/ss+DAfCWWSelNlYMZluSuDYv+BgkWfXHhQlEqkj/N8n2jfbReZpK/bzriNpRSCBlWMuBHrzPa2XwmQCOnwBX4KGDieirFL3mEWw5aSMJEircS0GlY9Pb4+BTRYSdkUfN1fNNjh6pIzPmFNpzmJZBToJUsxDFPNTfAWodOh+IQx434ekrLGNGThmePDkHlz4jZq0l31I0b0ofWsKZzqyBlzgHLNCBR2p0A26DBtLyOTQNELtVHTZjDkdXibrm95JKv7wZ22QC/42Gw2im9NgU8k5WdzBAzPTIJVwnOUwqmH/GSxuDxtlmg1WrY+2WCQpIkTnYl/cVEfYNZmvZlV6CckVMi41AzxcvkfNYuJmXQ9s1yLncQ10IlvVscXwdr0kj1ulK5xtO5rKNRlflfWWDXj4DyI7QyHHyw8Kd9nMSOqJlgXlV/8eL9xTmyacT7Vlyhk6uUFwEVMbq1MeFktL0HSHA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(36756003)(316002)(186003)(956004)(86362001)(5660300002)(2616005)(54906003)(52116002)(6486002)(38100700002)(83380400001)(8936002)(4326008)(66556008)(1076003)(66946007)(8676002)(2906002)(6506007)(38350700002)(6916009)(26005)(6512007)(6666004)(508600001)(44832011)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2p28NmMC/VWHgJSrDpmHQbFBhNyS2f5GUzJ3AjNIk41K+1mWqG5cu/fr5iHOLTmjy+4JXZ0qxjBuIvJMdE5e1PTjOun+VbveMzYCpw3rrw5uST5Q/UZymbq1+kFZsNsEdx6MhqDbrijwbMyY9hpM3quFu/WuVbO0j+jfS3xsJvESC6V8vnHWIMJJwpagNCk2AagKy+kWJwde00V0nEaHNcI5AFNZD2bxkpZeWEiFJT+PQNjXfXdzUWFVwBM0s4fFXGyM+HqzsbKlHRC2QboJeNqUSq4b0wCFIKOIlHkoHtjDuAEnwW2kgmJlSlyA7ain0PRd+OGcRXCsd4w1Ce/k6Zlqv5Muptsvm0b4gWVG4s0+Ei3tY1qYpIonpX0CGzoopFdCDtpojDjmU2nOCqCCPSea+EK2mRKhFduqBtMios1gwOndVcwHFwKeuEsaMmHkrLz7I/0i+boQx0lKTkctml0y0U8xWW3Ib6+f3yIo1pKhzjREZeNUiAQpcZCQBQbENM+uUW4tLA2w2t137Ve/dL+sljNv3EHrZ+nIOO9+UAjCqnqkvwZPlOWydU9BgTc51ydc8VGLpqgtI531VXNWxKMO4T/PBdqwdChZ/HWbkQpAZ6xG/uco92eiPwM7fK/VoIMQENlAKXj1jH/iKNaR7zCw6lH3W98XYg5sZQTjwNrTNA4KYiUGTis0boIeF2BDHQV2KnirJh/PFDGouIuGhN5c3QrrO9C6e7PJ5f46GTu694h/hrtHZD1I1mwOEuQYXj8AqTTHdqZLry7rwOEGjSXi6btCXYleeJE0WVEATJGwaa6eh3FIQra1xh2jcVPkyYFcSoL5ed2Og8MW0dJVyWJ796P1huJGW8Oahp/bvHsLvANyDT2+SNt8NYlWQx914SHJRPLIBsfsQv8yrrlHGRPtS0nebSK2mNgiMBiYw47ese28L2+wqZZNAvMRHxgEFve93KKy3lDShpPSW4vMgr0lCrzlKeuYW8dAHr7fkZjMs+cnQPYlSBpFb6nRAj+Dk0cnnMPher3DUpeUuXyhAGC1d1hLndF6ohF29qVIELESibMQ7IhIxpKa2wpCiCyj6Lw42s/LJyHkzmL4DtmgL3I0vPVQFDMfbxEa2nHQXaM8ijKDVVMVUX+YkZp54dHBRuRyQdaQYgR2gLU9tlTfxVlOkUvt+7Q2oARpz1jRl0TwBYueXO7Rm8hKvQyOlwTmqC8GmbPomjgofsH0hRDVoGv1OlGS1VTvtw17/QOyYEtdS1L8bCrb8hwHuKTomB1tR7EGQUIHm/qXTPQ5XAki1qBY1edMa5ei20cd8Zn2fyZMoIYSS1OUNu9jq30VvvFA X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22881337-349f-442c-050f-08d981a91184 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:19.5335 (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: 6yiLsaacVpfkGHWVu59zc/EeuLBjPRCEoJleGfL6XvP5y86FPptQPaVbcdqLFns4p5TV4PD3LC/2/cFT3sWZPg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7328 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/at91_emac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c index e40b94ad892d..b4581d8c9320 100644 --- a/drivers/net/at91_emac.c +++ b/drivers/net/at91_emac.c @@ -507,7 +507,7 @@ int at91emac_register(struct bd_info *bis, unsigned long iobase) struct mii_dev *mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = at91emac_mii_read; mdiodev->write = at91emac_mii_write; From patchwork Mon Sep 27 11:21:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533267 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=K2T7Wff5; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0cQ0hd8z9tk7 for ; Mon, 27 Sep 2021 21:23:02 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B54CA83604; Mon, 27 Sep 2021 13:22:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="K2T7Wff5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A3FEF8362B; Mon, 27 Sep 2021 13:22:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::60f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4061A835F5 for ; Mon, 27 Sep 2021 13:22:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YrH/9JorxBXjaivvKWqQbtOJMytFeyYy/vmMpXW4TrFEEPDsP50g4TvGVYCKuMl70DPfVFQu3raROYf+4Fv9HFXBsKa+KBanL1visx6HEFa+qIdjCdAwys9mTJgIXCl3Ll9LNWIrIY02avkd3R1KS3sMjY7YzdHhy0icollsd6OqueD6BWrJJ83T8e3uJVb+NGGrmCK8PCER7urgfVMSYUsVvJaqp24r8JKuUVyDLLVZn+ofqRI5sldcnzLdwhbGCg1j79drcogWY+1UrIWg7S0m6SArMYf7sbGleYwX6PSIMTHuQiXUvaFKRWfIc42a3uIENkQjTFVf3p6/17kdTw== 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; bh=ePuZhLGKODRpHkrNg+IfVstRsbaTa3XBAmQJdgA/Q0A=; b=IZ8wTI7rJPg9PvVa0XhPkZOfrxENtMSNcGwMOUg+jtWupNE/1R+FHqnUUsVbJLnpI9vr9v2JFHpgRhcOe7NMxpmbQWpE3lBLjqPDFO5kHaRhDx38CmOcWY5j4ULxeDXrBuYh71S8Jtic6vyRKD3d1zrFOpRcs43EzkgvFlRIQWInFU6+S/KQZllaD+ebw/HoIi4zAx5hxr/QSoa1ZI90VcspCUHmRCkdi9cNuFfCKX5EO95BD13BU+/TdT9XXPeqUl3FoRqQN3Y2EAGP7sff1Y7ZX71gkYQCOhS2FF71rdQFnesxpEXnm+mJmq0nDBENmCyJLzywyOEEzWLgD8zuNw== 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=ePuZhLGKODRpHkrNg+IfVstRsbaTa3XBAmQJdgA/Q0A=; b=K2T7Wff5lsafSpn88hwxRoCxiiUFcO7yR21qGtXvdP9jZghhFHIme+YhrXiGEuDaaRIPmeYaToXSKcnSj3whcfL0F56CXvZg1fVYbu15HlLswxOsscTfppBFW0uYCaeRDkxCOv43vPpP7jYuqHtlHrbtYfl/ojeuUlcb3w9ilyk= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VE1PR04MB7328.eurprd04.prod.outlook.com (2603:10a6:800:1a5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.14; Mon, 27 Sep 2021 11:22:21 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:20 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 05/25] net: bcm-sf2: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:45 +0300 Message-Id: <20210927112205.301876-6-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dedc5615-54a7-4ce4-11e1-08d981a91201 X-MS-TrafficTypeDiagnostic: VE1PR04MB7328: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 09ztjldVYI1jrGGy5jIYUGatJiyj+xeSKTMqwzxP5bUnpzEcQubg1wmZ97C5OlVp0uEyfzozzmusD5K5jWy2qh+XzPswx56zO7E5khkBMYZL7TXC+xAw0vv7aGm4sMjEaNhoKonl08vWM7T85nrE+FPynI3RK75LilqbAiPH3UsPDZkgdsx5YhBrh5JFe7tlb7Ij3IADj2E7CaoFsIkViX/hMp7vr9jczvTRiBTyz5C00lybJf21X8NtxpOFwDtnEj4k66kw2ya5A7LJFYqj2k/jBZ0UIjI3c4v4uzR0Rk64cRPBL77p96yNZQ6lOjq+NN+dbdbgyDRooJNeVi6rh58j6qj9FUO0YuVs5BNdHHHm4IyzdBdP2A0YMsRr/6c76JfzDhxrzXx2pH1gFFEEndIc8amFS8XbNJiyxNKp7SrTbKMA8v8oACkuNqI2xAmOlNIp8MWupUcKnqXj2Qgzxk6EwbZ+MzXYSCZHFnFP7NjwPa7g9hN04ANOza6BL3M7LQ0aQci3Nm0RgxiwxyeR75vcTNCRtx6y9sFU5jy6mVXkbpEBLwBl6eGvsiamCSr14EoAh47ViYT3faN4Xi8byXtZ8zhOZU1jdv+S+qckd9qaBMbnrV27gEQRRys/ylGq1FcM6cDLboTW0ulm3dlUm7MVDEs08SXUF+PaTsdE94iKKQOyZYOtXqPvxlZHDt2MU5ZQpVxu/TxEpDxzh5Ud3g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(36756003)(316002)(186003)(956004)(86362001)(5660300002)(2616005)(54906003)(52116002)(6486002)(38100700002)(83380400001)(8936002)(4326008)(66556008)(1076003)(66946007)(8676002)(2906002)(6506007)(38350700002)(6916009)(26005)(6512007)(6666004)(508600001)(44832011)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: on6PYR0tYNbuiaShMwBZDwm1x9BIAaAmVbu8zM9dKcx6BEJzOa2gwqQWz/X6KRwhUbeFJFid12/YiE0UFrNVQfivQk4A5XRKXj1gbfU1KS9jhqI78XeFqakgcWVMbPzlrhUVWXNFbhz4GL1OXzx+18V2tXnF/zhqP3AhNm5cA+ssagfdOzh0psdxAGHsjyAV8r++xr7To0Py4KuaQaTpEZzUMV23tvhb94B/jI9/kas40EvDNjU6HjnYH047HoPzWgMhchZ1F2Ai6CnsyHZgBGic5JsARXctLPF0KeUh5EcUtDrpnI+Rig8GDp6HLB4tcVcHp7aX/77p241R46EC0vxvrXzGudeyGQSpi2F2vccSyEmwGeys4RmkM0RVIpnZlo+CvdGKqCJpZOjdvv6ywhK2u5swnlL6M1fc4XfqaseOhmw+0EbYZsoeoQN5LP/1+ZNZ1ls3q3FNg8T0PQmaFAzjeJWqcUJHTaOccq+rORirvvOCUIxoZoxoNB1aUPErQxrm8ZEpJDkX60/yJDWnxj3fDiFNhduMuVGCU2vzrHYKPKsY/WGFlskmlyBoVxaIJmuWjYD8j/lrP2SqH4BMuNep1/fW3S7PDG1hDIxQUn4xFWuNNsoSJxgSFk9piMCE0+eSmi8Db1z8J0kSKT0HFN1oQ5349jhwfgNzeQl15Pcbu9qX89c2DeFyXDIi2Y+RWDXDOthw5HuqpJXSo0zXpwzph3PeHPK2pG+XvZeDlrvdyn897uQHdNAaQYN2jFiCctqtw3WSgHqBzbO0giVCKi9JEUa5Pje0yKxtcT0yTOK1QvbYGCLM47x7WNsI2bvwu7Q//mT7V7emvCe8ZWjuFjn5tn0o3hLNwodkEmnhxulXqnBmgh5VsAtHSk6mpM89vfdtwa9PsoG1jmV4pNYBnW37E07BWux1WYIBl0NXCOCrqpZlFIrhUxULwd3jY2G8FuQhP9ijkAp+BrBnNcjkF3n+zj7zIioSI2i9QeV/Gk+wbvfr0iTaqNoZfbrjkQZtnLxuVTpolowOQCmm1H0OozAQfL/verQYTMnuDq1O9Df3kV6o6D/WpqnRJzRJtYpx6CGNNFibd4qVT7aswWD2TWpYWBJPs80R6ix/DdstxarVJl1txUhAlsM/Lw4Eoyhakv0vsPosZ+YU/4Hi13KmDEjzq5PWR4B8rftF5fngUByWD1OX/qOBsFFqWxCHimlPbaN5mEdmiuE6Fm7xPQIXFfGLwxExlB9YUhZ/7v433biD03iWhO02AQU+4baSe63U0y9eSl1yL030K9qUFRY+Pjkf7Regj8gXEJOPyvSOFg8F/EpdItbB/2gOT6hMIypg X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dedc5615-54a7-4ce4-11e1-08d981a91201 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:20.2930 (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: odNDZFCzgTHbwXn50AzxekXCbbC4xJUmvaEWcNfXdudo/Op4It4DGmnW/+kJKXsg1hANX6WK0qx4fUp1BYhpXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7328 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/bcm-sf2-eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c index c862c141461c..88dc3ab38466 100644 --- a/drivers/net/bcm-sf2-eth.c +++ b/drivers/net/bcm-sf2-eth.c @@ -250,7 +250,7 @@ int bcm_sf2_eth_register(struct bd_info *bis, u8 dev_num) if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = eth->miiphy_read; mdiodev->write = eth->miiphy_write; From patchwork Mon Sep 27 11:21:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533270 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=FHzP3g0R; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0d73M65z9sX3 for ; Mon, 27 Sep 2021 21:23:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B6B4F835FC; Mon, 27 Sep 2021 13:23:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="FHzP3g0R"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 419E483633; Mon, 27 Sep 2021 13:22:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::60d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 80D9F835FB for ; Mon, 27 Sep 2021 13:22:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XfrNOU0EIQ9aBLeX4OcpOaD436/EO58qr9Gex7ogxt6STk5s6BXmDeyOGlBV/1It6LnGrjQ+6L2JsJ2EDqh7UXf8K108m/zIo8EQYGQj0zyuFCPUkoDej+Ahij4Rsm4cjeqoeen/wCLKlqU0auMz95JIxX7KgOmryNpPgjP59RhF+1ViY9ZnDxy4/ITdOP39+7Z8UnUZzUiL7xHLFSNKs9TmgOsmYzI5a2h4CcU8DNhOJbNFbHUT75hZH4CnaX031oFhsNMO7IFcMiFqiAIYG2qfnoiBhz11bEMHzsXpS3CzGgP9MlkLL+tenV5LJmH2WuIxIMHggey0o0e3U6sGhg== 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; bh=+lDX6ZFiaoJuUMBnYemIpQcZQEj78kIPvwBRhsubM9s=; b=LKKoYpWRjuCEoer1F/XozutlGkEPHkryTsBFypFAtKERplS3t5m+Xbaq4PeGXADio5sKJak8Yl95Wg9aVjtpi48DVdDDD2Pb8TW6fn3r8UiCn7v8GcwOqiVvZVSXmA4Hj6OeHYftCCluYPKJPNktKKwLnbuH0x4A9YgcHyjUhwIGBbHQuDkRrckqgw3HsG4CSed1bq6a9GjqDADeMaAvnzHxxFxf6vHTlSg4Q5TimUW+3n2Bxm8InuUqjjw6g89o3J0ethUMtMnNoyKEsUTB1GWzKoe1Bw5mAFTGslEdBI/sgpwG6xqHMSva4WXVwBRrO2G60tUooEc4RIEoTwc6Mg== 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=+lDX6ZFiaoJuUMBnYemIpQcZQEj78kIPvwBRhsubM9s=; b=FHzP3g0R34LMsWO1/KvkvJJoaU6yAv3uB7YHM+Qxp7uvy0SjeCx2EaK5OgvGI8N9dASM0rI8gkjbNaWYVshEqsZ5M48Gkxw8OUrnQpkcVvXf4BvGysdDqBA3ueIKoywubwk1YKd8wGUKKE8EdYS1i8lMVCX0+6/OX3OIumwTWhw= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR04MB5503.eurprd04.prod.outlook.com (2603:10a6:803:d1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Mon, 27 Sep 2021 11:22:21 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:21 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 06/25] net: eepro100: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:46 +0300 Message-Id: <20210927112205.301876-7-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9e4fc2bc-9902-421a-0d6a-08d981a9127d X-MS-TrafficTypeDiagnostic: VI1PR04MB5503: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N2ydMzb17hbxVArtMTtAc5Prap+daYyAOipW7CrFU3Lz86avJXxGNq+pOJXeWPtBJAgQiOywP3gLD2up/aosJLvXE/JrPPg/e2+m49Ht9GTCpxVSVebY8QdegCXoIbe0odGqguwA2V3CxvrOrdwD2uyS6dKh5R0nJF2UtBIANX72ydAQS92/gJOofx0B/ou85LK9ezyl4ILrhKNUygjiWX+gaAjBgCtVtIxHKjT1WddCPbZtDwKcN8pNZXTvF6kwyw0+d1m2UrzTWXAwBDu/9TcmuksNv8prMaDh7m7tTSUroLmpfEyS8QppSUDgdZT0M8OMBEWjfBDfWoc9py11YkRbJB0kAq5bLIMgrBFM6TRuyAdW4IpqsDILj+YGh5cbxCnnJJbZXd9lnIzQnlI0HoodNIt23fxqHRFLPV7lwvmSc8uU2oMMqbwjKi1OA6Hb5sGObNOIbTYM/yYmjzn3ScdIj/x7HLgHCEYlqXFOewERNwx/a7zHVp0myZOxnhUjUmqUsgbMNSWXxRz6LIW5NTCVebmfrrjutWGeuub0nV67mk/V+6VlE0GFkYWIRYyTD86sBke4w6kfoFNmGFJAokIuNM/XCLu3d4+VAjszBzY5Vk1sq5RvVdHWn3RX6nXHdJsShsh49yJlSr2sXbLepMq+dVfrRiiJlgUDPnisGM0bu/8LF9SrqXERlsFS0wP4arAJwxa/JV6DyM1Jfd4qsA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(5660300002)(956004)(6506007)(52116002)(36756003)(316002)(6486002)(54906003)(83380400001)(6916009)(2906002)(26005)(38100700002)(66476007)(4326008)(38350700002)(8676002)(44832011)(66946007)(1076003)(186003)(8936002)(508600001)(66556008)(2616005)(86362001)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RoSnwXvdvmDcEBcOcRvOw/omW7qEjJrO8oVE0dJk/erQtN6avKTYRlA06P46P5jhNA5Bu4cZIPwLM7hU4i0Lplz2509eB30mxbBrPxfXMlpT3ZqvrYzfamJNea4IdOUMH2JUz2NjrFI8DM9lXiqMXDbKkBGFICvz3rc/IaZdOLEGGBK9dxUvUDXs/ebdiQX35ihAuuso+c10pIYu6PJgxRu5CV4MHnLR9wM8KvAhCvctczKJiCfNINPBQrNT0Fu4Ym+bBX0+G8S3eLzNmHHAx432OMkj864zNDK+51m3RfwidcwcSCww2yRg388FOq5pHlNOHGgw5iSh7lB6jJh71wCb86bIgKFWK8yFz6kx36nHm05Kvou51kj1tgSq0XxRZ4S77CCJ+vqR0QIcvh4wXui/a/OuyENhBmFmXd9G/XBMFmEGik/LoMyJBdZxjgG/lHTkhlV40qthMnOgc3hMLFKCM+WgwPFHNnfoquPZK09pmn+sf3eA02DSf99jBWSQkgMIdT45ASff4AJakr68CSgvpom9R3t1JVQV39P3pdO38ame3wPgNgBlRCxs5h8bo/FnhlYfn6JOINtNcCJWah4kwMcHWG5NzXt7kzyyiVyJqy59s7h07pZzYOCz+jsoP/fHC+Bo9Oh81EX/tMLgqDlKD8sp8S3m0/aXNlY2p1JbJcVpzEgLHIBBo9IcoNVycMwbKgV19jXP/0ykHKQ+VwlxOdBrBUfNiygEAcE0/V6nWbIOqiGODGqL0Mh3rMmHvnZoeMJgNGYA60Pp9GyVjfk+hvYoCnSJ5MnPYF+MvSCk7ivkt+OkewdOXLX0JxCBh0hBB2fm2iPr+7su3Fzcd9pxq5JOT9AD1BEYLrw0S2/3V3/Qe5yAqEeGiSrAwrQL3QOq1btVMMIyjgmVDVB8Sq3P8MjY300OkZHBkdx6Cba04+hsALw1kpM7UX51Kc36GxFviJoe5omLIficykCxjWX58+H1B3WXUCvBgKy0S1D8Ksf/7CnOBcX9Q8aCIV1PQeXjvYhWdXK3XQR8+6EZjpNPOwlXGYpCPhDggqVd/Z5WEM4oS6+0qbz2BIoxzKLcUTGuxjjLtTpM0bQu3qyeOw2L3ZHvXO1CovlOLTg8P9vXdfsMtVEeY0V57gzVaVX+CaHbhgKH0fYhq1tEj4SGOahPp1RQBfVj846TsBLAfqxIuz25KPBZSDQVF/JoOPSC5wE2PTPyGFlKtI2WtHgvFoawmAYlcHRn8Tyqj0kOvqLHjWbyIAsHL7BLGUOGKPTXmNTsNczz5mbyI28ERbsAQylgAE2HaEpn0Wwv4VRsq/ttHvB2bvi62QkvUQQXyQIo X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e4fc2bc-9902-421a-0d6a-08d981a9127d X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:21.1176 (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: RR0reoBiXPF1aJ7VHp6cFxwwCGv2HzudXyCR0nQtcjwAfmhseaovDJUKVeZPrQFAQT76wJlHuL0cGhHazeI9eA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5503 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/eepro100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 934b881219e9..935cd9c99cef 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -493,7 +493,7 @@ static int eepro100_initialize_mii(struct eepro100_priv *priv) if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, priv->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, priv->name, MDIO_NAME_LEN); mdiodev->read = eepro100_miiphy_read; mdiodev->write = eepro100_miiphy_write; mdiodev->priv = priv; From patchwork Mon Sep 27 11:21:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533274 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=LJkWAs1e; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0fC1c14z9tk7 for ; Mon, 27 Sep 2021 21:24:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 85B0583630; Mon, 27 Sep 2021 13:24:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="LJkWAs1e"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ED2EC8362B; Mon, 27 Sep 2021 13:22:40 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::60d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CDE0A835FC for ; Mon, 27 Sep 2021 13:22:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hlMQPLx9XZzhEgwUMPQb6o4+dPz6sK8WCaTXK1B29kGeCwPUru8TRxeb/KeSgcNL34tRk+B/bmslw2hM45ONqBnLOV9JheIy46jWqrocoLUrWU0qqLRykxWPxMqklp8odTdrmu4V5ujvSirIFTmnbu8WeUluI6DzCT5ABT431oNsdC5NjNH8ELUUvdk2sA578STyHk23zK1HJX/yIik3YMg2CofikVXymy7Kt0c7THs5MkN1BQdsHb5TgoKpPpRC4hR1dRSQygmQVJuS9CBIPErwAxjW56wMAoMwvXdh+oTpQ1MldMLPBgtC0gtJYCBvmQvw8N3qDdIGT/6znJ49xg== 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; bh=AFOyUACTt38zjLFhCNlHiG7KYOedW2GzlP4nJuxCIE8=; b=lVns8SCsA4CIGemzhVsShEZboDWEsnuWmTSZs5hTE9FotT2wu+aAeBSeqk4O2wj+s8IZWbbFrLj4WNDjaqFqR6aWrI9aOKUyVVWquhEho7HDpbL3AvarEhKSt2M/npROZGmtuEGvaG6dSeUDDp+mW/u5iJXIt0DOOlJpRz8hXL+U1iO0jDuQlgWEPVHYOGxVo5A6v97CP40U2fNGYgAlVB62tBvodE92nxYL8YyTBdQfzPcdS8+lSErUvUJbXA9tFJ6DwMtw/s04vxYhU5gLLjEC5ab9QS7K8XYZzeRcjg9ibMmUbH4c8SOtb49VZ/b/WXOQX3enxIjgdCtl2MmLmQ== 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=AFOyUACTt38zjLFhCNlHiG7KYOedW2GzlP4nJuxCIE8=; b=LJkWAs1eEnN3yUDE5RFybAa44AKsEG7EPjUoamYJeXafMtBQZLkDvbhrexWlFi3O8lG0BMslgU8D8kaGUMcHK5qAI2qZLjkg/g380po7z4RrzehmDMFOzwZQ/WGqsGqPqk0Z2s2HciWphJBI+97Xt8gn8MrtsPWIBTB6y7mmPBc= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR04MB5503.eurprd04.prod.outlook.com (2603:10a6:803:d1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Mon, 27 Sep 2021 11:22:21 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:21 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 07/25] net: ep93xx: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:47 +0300 Message-Id: <20210927112205.301876-8-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02a8b1af-5827-4e38-1291-08d981a912ec X-MS-TrafficTypeDiagnostic: VI1PR04MB5503: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sq6lajvZ7kpcaqQBXDUX8WI4hZpAKQzG/sWOsOSxxZlkfHe0+DoaNUN6V0FgmNYNArj/d+h8zmdgfnKhW1fniFC4caibiLbKoNbmx6l30QQkIUyk17AdaCBpy30NX5Cee3oOl1CgNMLM+Iq5R9Amqn0QVYAi83gXUTEUaVFHPA2SNgXjuC7HINHbPEG6IiKTvRXV6hQGLFOEawuXUy0WIpEYdfz8QrCxQza561MBLnuxTzS81sEBxFkyDaNdg9muVX4OJvizmWSBz7DuK0ShbvtwkA85V5r/aN8wKj9daqCJwIFb+aOVIk7H07Wozcxl6W7QCx/mNADcoN09tZ6Y3+ODa2q7MzTEGAYTQW4nDPqFCIYTHKnCaeLvCF8wtZDWpt7oyRh2MkQ/+/5vH0Pd0PjiG+Lyj6NkCrWopW15lzbW4REYt0V8SnbFIJ1v7jHY1GYWG00WBROAqTXiKRtAf/GLRCIGyAIysVhlrzxYB072f4osqQVEebFDIBHv4dNK7MIKuSMVTwqasJqGpkB7X9lLZ8iO2wLYWO9osE4jYJvCcJFjpK/y08NMtjlq0Tk5XqnqfcYjV3EZIiOAnWwiZlY69ZXjIDGI6ckwBGVeA1wcVwFJffmzjDkTzhpr9kyUH0enpQ+tUDZ699JdLWOjVhTcStAlMdg8YPHvzuODed2W5FTqjFc2M267qfSV3corQID9v6L6aEqFp1Dg32FwSg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(5660300002)(956004)(6506007)(52116002)(36756003)(316002)(6486002)(54906003)(83380400001)(6916009)(2906002)(26005)(38100700002)(66476007)(4326008)(38350700002)(8676002)(44832011)(66946007)(1076003)(186003)(8936002)(508600001)(66556008)(2616005)(86362001)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FrwlOaglkAwPADr3W4pPpilKBUCnZ/R5qTQ2pp4t3Y77G4Ou3lHO4etIFiEVZLtCpcTaOSXTC/+Nu7G/kaAPNpKXz4C9T0UPKpOuGg489sAn9PAjRIXH9rHQ8b1s49C3HeeIzFt/iDbSmKRQj0YOBUw+RkqopLiCh9Gyy576kw5zpErf/wjWmZrfR0SxQv5f83roLt1MwQERWfuQKbZrb2KppOYRY4fR8874/+fQr7CpNUpdoLndFyyLGleXH0B0Ltz8Y/+4bREX5B+Nt9Jj6KISDlX63vOh22/ffADpo9POfurMv82kvDXCNj4pbK9ZGVCHCvPNyPpMbgE6sMknpyASN51WxGe/15b5xZEm/2+cPflUhMSzPzs/TMr1DQfXH7ixPcTYwGCHJQrTqz3A2uv/bzlILGM+YqC8ltBU8Ubnpa/uwWMFTrrw/5P/1MD34NC5sCM7vuf0dnYtyTf67RtSyj3sqfJggl9XftfZ7Jvu9GnTcdbYx4ljjekKNgHV4Ac6Bl1/2t/xibnfdRl+7Tj69TAPzEnDvr7e6sYwI0jHn6EDthvqx2GnowzOvjW8/ZVpWWhzxu0gXbfx4kKVYoRZUvKUtt6i3Z65b9tIx+pUZfs+NbvimL7avB83TmjyQNFVy3AneSETV0osHP5GrOIrjMtLLMSN3d79xzG/dzjp7Z+ClGRlCIr/DKUAsFTJWJdDGuEYILzhU5AqiZWJrRsxFfdd2odPyhn8AlFwzhkX5UvSidLkftbLgpDZ7zBhyqg0u1JfsF1Xj/BFlCjmjNLEhkUTNa6k5/+G693rZq9VOaBLmA1n0ufDpSoQx1tPKwumdc2qF8I3eTsdiWgBSWEX4B43vgF94Jb54zzkR9E783+870fPqfSNUEb8cDbsKMsbyhAL8REOcePbi0ithaU318prk/lX/AAi+kqgYh62N199Q8NiBRkjclg113a1agBqyKJMMpZ629kOeZDd+4CrD/oZGVViG3ZikECWiKLcOUbCknGOkjpHZyh8rVhjf4/JCzbfhWHYlb+QChKvcA4s+If4svW5kTcsi6BTSwfEzGH5hXDBGs18vr9u+oOAjEj7mb3g4wEnykxRquMVR4ep6S7Ka1asxSSB1fDTkBydInFFSfQW9eMEAQix4PwCK6XFT2dc1LQYT3sVoMXAdzgti0VuIvpPUgabl2XKx496sqAI3t9C1olsd/c+SyUfv6z/n7HlZAmBc3U1lZW/18P1HuRUVptXylsH/fYCyKbqTiPjjpPn3ZR6mLC1RFs/QsBMo6vH4CvvBXNNb/0iSkscioIxEr7zPM7aNg2O0ZpuoyhRs++QhA81X1IZw1Be X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02a8b1af-5827-4e38-1291-08d981a912ec X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:21.8302 (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: YFqNgjvve41+C42fS2Imqxbx5o6ACEiTrr5kmQXctzvYzmVMP7OfszfvP6xvy5x+J+mo+UWoy+nQ81g96SzwRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5503 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/ep93xx_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c index 0218349b0450..9f8df7de0609 100644 --- a/drivers/net/ep93xx_eth.c +++ b/drivers/net/ep93xx_eth.c @@ -427,7 +427,7 @@ int ep93xx_miiphy_initialize(struct bd_info * const bd) struct mii_dev *mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, "ep93xx_eth0", MDIO_NAME_LEN); + strlcpy(mdiodev->name, "ep93xx_eth0", MDIO_NAME_LEN); mdiodev->read = ep93xx_miiphy_read; mdiodev->write = ep93xx_miiphy_write; From patchwork Mon Sep 27 11:21:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533284 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=b1Bae60H; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0hl11lLz9tk7 for ; Mon, 27 Sep 2021 21:26:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D123983663; Mon, 27 Sep 2021 13:26:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="b1Bae60H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D09E5835FA; Mon, 27 Sep 2021 13:22:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::60d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4EC42835FA for ; Mon, 27 Sep 2021 13:22:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lojv3Oc5WcaGwNs+0u8KghwIwhmtN56kgMGZ4NuLbHiR19oHTvaCOoRCCPwJNbclGebFWTGhnJXPR1kDzhhp9PZxe+jYfCZ7Xmgu16QytFxrK0H+eUYxAdpLzdtR+nvU9/zOiBAOcv+vYEp+7caCx6SBobRFxVMAeduVDz72SrMYa5VqPWylI/zAyH+4c5JoV1cQYBMuhZfa0XarK6gqoemKKhvadCVd1AyAEObXkv4N3vq+71TGTcZCtKQlAzEJ7S1LYUHK0IRK9mFbnpulTadgsKJSbv2l9YX/PKlTz1AMoSkspZyQSPCHChdv18v4rm4xgYu3JQwO2vdlu6Bd3w== 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; bh=i76dp/ewKt1UXT4wHtWV6nXqXh1f/O6n40pviGcD6Qk=; b=OlJZZDL9D6uXnyTJQUg9lAMo4EckQbi7IeVV5HAi3V36WxdeEy0NPGH+XAc6xXyEmdfSMooVG8f44Yw/fAkiZ8Unx7WxrmNx8X6RMa5GjCH+4hKmrXdfbv5nUEKhHiscjKaoorhyQ6IDWP4/uAxNC+sdRYlDesFjspHWKN7P2hBWFgq7E8k2bXcpvAWYdBHuPJTI29f+HLm+yKRNm1SPEJnWxF0kXAZgzzglscytWGIhKlc1rOF3ffsrDNMNo6BoriPyXQ6hPuGdIy2YbXW8U90XrCjKwbbBk8bOAqjCL8YjKtgRevdyJBdYvpmpkf/wYKXFfmJquhH7spfyTvVMCQ== 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=i76dp/ewKt1UXT4wHtWV6nXqXh1f/O6n40pviGcD6Qk=; b=b1Bae60HUw6ww6DkWAQwzClQ50VdyM8L2lNj+ftCa4yuOrRIqC9VBWj+loo8K88AIsIAT4910rhWkCwo+XBAjkyz6piBZQJdFePoZGpUOXRd/fkkRUmYCghYXjkwX/HQeqi+N1tSJ6ZlZoFQsxK93GuR+87bXOiS+ZziqQ00h6k= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR04MB5503.eurprd04.prod.outlook.com (2603:10a6:803:d1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Mon, 27 Sep 2021 11:22:22 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:22 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 08/25] net: enetc: ensure imdio.name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:48 +0300 Message-Id: <20210927112205.301876-9-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7df465c8-2cb2-4e57-b3e2-08d981a9135b X-MS-TrafficTypeDiagnostic: VI1PR04MB5503: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z0pGmVH+FbVpsuxvrvrqfv8DhMF4kQfFuSXO1Rubea6hdWcnq4GblLNj169/aIwCn/zgc3kjbnZbdibtuxCbKMSAnneDeQPsfdxAGOIx1fauJwiIQqWxMrwCA+Zc+WxRcZ5St1ydW1iLpIA206iMejlx/Qedq73VI6nJmNFXaeqlIFYX+TOpspgdvdRipNzT7/zXtzZhE4anHjzX0z5kl18k4qkHbt5j6iC4QcNHm84X4c/glzKv/jH8uP4xFtCv3ge2xbxQPaUm7uh3IN5h3QkcqgayADz9+NufdyZ0pREJlyG5o7HuJ8dIoLFUK0ctpgJu/Atk8i0d9mANo+UsZTiYkBIAJXU1TzT3vJQ6CbUQyXyF1NTFkK7YdlmgJ2zbFtDHxEjWhXlJhAX26KL7aA3qup2rLzKoPyckNQasbgoPmPOK5Z4zciw/Cr6SPwc5z1vDwLonYOYhD5jZKql21CuD3X8wL5ahTkEV1ODN7FjZ/z/szJ5eqmLoY2d1OyoUxag9gJZ7d0K7iTNzeITUYgQXD/o1OLKwL7zc/tLTec4syhlr4f0jdwtpw34ppRMop7AFT64v19HSC9R9LpsIlNep/us2zbyezaGv1rq3HQ2LNBz2qZzMsQdp3JY94WIBu7oJBHvgxv9uz61RhGSbN3oyasOjLdP2vFycYvky9/Xf+VfWOIxP22CyrylbjdEUYi6eQEXPM4rqNJDmiFoFKg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(5660300002)(956004)(6506007)(52116002)(36756003)(316002)(6486002)(54906003)(83380400001)(6916009)(2906002)(26005)(38100700002)(66476007)(4326008)(38350700002)(8676002)(44832011)(66946007)(1076003)(186003)(8936002)(508600001)(66556008)(2616005)(86362001)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yMzRPRREVOoB2igUkV2C9vBWk8J8gMcts48qhk3c1WN7H+qyUXX4mLTGYJXVpy/l71s0ucYgLhaT9ljRyYm4oD+c8+eXlZHl1HPPMYCCkAe65bhyZOZHDA2+Qb8zZhEqO345uF5PrPQhN0eSSvS0Lqp6lI+kVqFk6BJEvdFCfu4e3fhQ18SqmjNIpN0un3SbODTwmV5CrFg/ICYcXdJCw3IH9eqhwy8cI4nVi7QUDvLL5o+VLQRW3q6s4f2wD3PlJtBjddPV2CP8LYEbshuF+aYG520Cl5cC0Vtbg2ET1ZwcLLT5RZQEhNduSDiyUdr0ba8uJbZl7oXUW3eQFxTO+iBzy4lKHPdCysEUTrMo0tQYme/U2MpeLzx3BRH6G8Fa2gyX6cZoMzLKUYS90xfUlhBRds4/LqAgQIgVl8M5UotrhhF72BkY3665dkBO7jpCYezG2ZPf++8I3lUGmVkn6FHOwc5sZfXGDR+phlXOoBv2T+ddZbFMs+75x9pTVts9RK1VzRVAUI/X0yz8boEgXR7+Pjxca9NB8f0k+51d8Go4L/AphinGFGS0JY8qIUSsKxuW22Hi9x44+T4vxrpo7waXlMG2hKYlnn9eb3bVTW72UQ6uwqjRd8uUcVV4u1abz3VUpbTi5bk0swDYh7ty3svHJ9K26L7YfQG73WlzZ1THpTuDQCOslDfDy2UsvNSHRvT993++6PQw7mnbpxC1uqrdZBt2fLQil3usYrVcYMdkY3oCJMogzKDB/9zYKAvJVhmFr+6pCb1flt/VJAAL4wbC9If+QXPJ0qUG7qcCp0oe5ycb1sL+jrxKllBUKU+qSaeMjvW2PtuCqRroWHLdzXtlahgz7tZqeyp0D0RynIYQJ6DyErvJlNB0t1DIgyZGom1pFPaFNnjUCQZ6ML1oaKq5rCynTYWLM3tB0l4+W8YlsDQk2pn7Zt9Hsmqac3fR+Si7Dh2sB8VmORxxrhXhqQRABi26pR2F2JvJCFfqrDTI3ya9U1A+Jt7VsSnZjGcp7rLBN1JJ98rgcD97it21BihTpX6WW0i2pYyUSJdWBASXERu99k9SD43dI+zC28TuRb2yf7XTn6tW4mQ3uMn9rUowuwtLNrW74DIlOHZuKLLpBYF6GwMY8VGGds++zNEdnLIYqsRVUPhx9pEn6Dfq+ffxB5KUTmsYnpPqjq5dXBz2HbJjwcMk+GxMYcXusIKyfLfi9f/XPFm5hysmdBT5k00ffuv7a5a6XCtvP6IGtBk1qgjCpcNXtYSfjdRTP5cj0QDcV6mO8pKqiL5Yw6KgB+skQZeC31DKp0QEJQ224G/n0YfFB9LvEdVOGVa6eoVl X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7df465c8-2cb2-4e57-b3e2-08d981a9135b X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:22.6267 (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: y9G4BnbcR1vohlUBouzZqdxc9XneTJVk/baUA62KpV1FE287aXlCXhMUsMCIxyNJTTWNePtXkvLLtx5OKpoMYQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5503 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/fsl_enetc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c index 566cdc7e546a..b7e2c1f0880c 100644 --- a/drivers/net/fsl_enetc.c +++ b/drivers/net/fsl_enetc.c @@ -270,7 +270,7 @@ static void enetc_start_pcs(struct udevice *dev) priv->imdio.read = enetc_mdio_read; priv->imdio.write = enetc_mdio_write; priv->imdio.priv = priv->port_regs + ENETC_PM_IMDIO_BASE; - strncpy(priv->imdio.name, dev->name, MDIO_NAME_LEN); + strlcpy(priv->imdio.name, dev->name, MDIO_NAME_LEN); if (!miiphy_get_dev_by_name(priv->imdio.name)) mdio_register(&priv->imdio); } From patchwork Mon Sep 27 11:21:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533275 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=UHmi+Ee1; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0fV3rKHz9tk7 for ; Mon, 27 Sep 2021 21:24:50 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9384A8363C; Mon, 27 Sep 2021 13:24:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="UHmi+Ee1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 574888361E; Mon, 27 Sep 2021 13:22:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::603]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4E00283605 for ; Mon, 27 Sep 2021 13:22:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=km+hL/KDolgC+nPwWx4tBV8Lr7+v9ara3xBHUQ/UZ9v1pEq2UWbcBdS+dHZVfkGwXpK/Q+7wQQ/OKUab3ASXg6Ysg1Dqr7KRtI7635+GHDcw+IUao9atTYYt45mBqiGmB4rJ7B0JEBuMAyPVu7swe53wmWV2DUey3KOQPG5XicI2U6+MlgNHEoHZ7xPxLM/kbkHQIbp9AaP7CUlCfq+QeX/Wd91N5u9JBxt7bZwlVzOov8cHH84Vs0Ts9ZZcNX+w1qtZVmSvdFJ2UrMdTxrt/3LHoHBOEeCssfbswm5cGkFq5T8BnTzLX7UuEPpaJCtDBdUg/acoWjMwtY/kKEaCWA== 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; bh=TgIlWntYJcPuTuGAuiuFdFyJhPjFw1Sr66wmKUtB5cU=; b=hCiDeJ11Kxl2Mp31QqfBCo/E5YowHFwf1fNpL+P/oWZ+l1n0WBsFziqKB5p3Vi2G1gbbogwjsNbfqtA+5t2NAc5YdVoPthbHqjk07PvlUiJC3KXALJDpGgIV/MOx9xOSGdIYlZ3Esm6jYo/SoJPKKcz84yWk7Mucem/hd5MnN21ZPgwNwxwany7EOvFCtG45Z8gjlbjOyAnfEGAGYd4drfCwTNuiS5VPI7tPWTPkPqbnP4FgsvaRYwg7Xwih2WPLWMl2drX3u+S09Ca3sF9wCY2J8bkh8ZnjOgnGXXwl3uuhquL6pcksvz1XXNCNjVHpS+585kRziceN2dUkva29cQ== 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=TgIlWntYJcPuTuGAuiuFdFyJhPjFw1Sr66wmKUtB5cU=; b=UHmi+Ee1RrKUcK2QlshsoNKF4sqjzZaZZXuKytsmnfp0rxVIsG/7yELd8kidryPICT/IIDhbmMVt4qHI9EdtueVJSdDQIU1aaLrJ4bpPyZC/poIwmaKlwncZ7Kb8HWjK2MBSEIPw/glI+YRa9TcyvYCH/9AJaDZOFfJDPlxsJq8= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR04MB5503.eurprd04.prod.outlook.com (2603:10a6:803:d1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Mon, 27 Sep 2021 11:22:23 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:23 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 09/25] net: mcdmafec: ensure bus->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:49 +0300 Message-Id: <20210927112205.301876-10-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77a0509e-251e-4c43-daf1-08d981a913d5 X-MS-TrafficTypeDiagnostic: VI1PR04MB5503: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xg4T9wAME80wZLAb1b+hkziZNz9q4hzw+Zx8KW/aCc0ABS0VrIV0myAPtUawOSocdmu1CypFHRZ6ttZ28gthMUNmbx24BvTm28BkxVqv98Usu4LnQNC+15nmn8YmMijNDUcXSm5qvOA3AtXaAkaP4F2QpyZDe2FkqVDrf6QE4FvMAQOVyEwwsqvDVMe3sqgFruoffslC5Tv2T+dF+0XfXxm8lVtzLNQ6Ppfiyl55xM8Mef6sxy973rJzX3TV8l/eJ4qkj4+ruGr1blokxidT2/eECvv9P+OUCEG4pArs2fUwhypiEAgAb4R+rGQxdOBxjqKeixJlJyWLP6R662/uWZXwXKOeHr5V63Sdon65h18bP5Wks4tqalWd3jl6phZs7xfm0Y+g7yLDgqu7nrt1aWc/TE4QlqmEfd92aUiepRzrT92ZMIrqMAPQt4cnAHs0eiDOPHOmSqalLk1OnLrEM8cXRMJZ0XsDTwrOIeKtb0CJabTZLK9aate3t32qscrIaPFv3xuxKtcTCHQxuarMcLRqmxA6TqdyEZ3NsLwkwHEqRenureCVXl1F4qk7JWfjNPR5fCV/TYYcSr2OTML/68dDED8DJ7T4KN5R0BDfDTsHHbIc+YRlpVDZkBiH9wmQ3Mqua2lggOKzYqICobDcjhluKwU6uezwlJ8Zh/lavQnVsZBp1i2JqdqujbP8jqzCbHK8oJOc9Un51LVhJOF/jw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(5660300002)(956004)(6506007)(52116002)(36756003)(316002)(6486002)(54906003)(83380400001)(6916009)(2906002)(26005)(38100700002)(66476007)(4326008)(38350700002)(8676002)(44832011)(66946007)(1076003)(186003)(8936002)(508600001)(66556008)(2616005)(86362001)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZNlsNNyquPgmOzM0KmAXOwcSIkaaEJ74IIEAJT4tpWSfBpofKGTS7Uzo2LTFdKcBmlKlMskQ9+DWKyGwbLOoBWLxcPvp02GsAEdp82jqNIJDhvLcN0W3Zv3ohWzWF9k5NYk3bMWerbF9Yamzihknb3WAx2bkJzIXJEPaaOBJCGO8wyDKB59dbLA3h8cvhzcXxR3G62E3SnGyjaruQHriZClv0hbowqz2AbtthjxceVsRSX+Zq64+4vU7O4kMm6zLvXaOOXsXQ4+xUEoe8skqslbAR1xB1SK/Sr+yvkCciAkn1TLRpLtJ8osGQhRjDFKErBGAOGbscXzP6g5rMN0WPXWoqDD647w7AYdoacOPZWY56fxSdp1tRt1Ihnf9O+nEgxFzkwKsg+/kc2ZmPUfdjhW0NfFfWSFO7rhT55Bica1JDZlG/8lP2WjilDJdnuT9NyjRoQ2Vl0jilU+izlSxfM7QVAzx28LL3K5IIbA2vTTuDqiwg4VVEIaNriL9QHovz1XchiNCcXyjq+qUJun/2DGEMGCVPIS8KGhzFpX3NuSl5L/0NIDf7WPi58SEe7ain+r0OyfZRT3yyJFzAVd1qC8bDSS8nn0SYm+ASoRJbbdy6OtxpsjgjW2LYeSbiF7vVRQw7azVttEs8n1x2Rx8kVGMUxG/fDNLBiJCWegZUaHEiUHATQcfTP/Mf+Y3KaEW4i8o49N61bQC33CN1t96NunhrewySX3jZYlMZxggy3x+INkm2eEeDvaOy5FBJlnD3rE/iDb5GelHRbOuotjcPozExYmyNe+Tq20/161fPwQsop3IZTkrgBI36lHcu65NhUM33NxNayh0GUfrYfCqpfLmmdZLgqHs9b/gCrsfjfrmmsOVNVKTka43AWHc/I9W18euiEat9oiYjK6na62SpTLmU6OITUqejSZeiXoX0BPfsdrfan5e+6icrB6IfwsNEMu8EjCyfWlm6kBb8klxpyFoUjWbhb7e/Zuxxc4DuQNyJ5eEmlK1D2WCXAdL1Anvc+0Qqn81XrRuat53lzr3LT3XFb4UbGbuKu9Jxlg6yzkesKHkJw7FPi3FMDasTGTYC1u5mIsn4xBo6RiYztE+989fnaNJRasucHyNAOA7WHdv1COHZ28o9JTes/UiJPBxcG0xj2bLnOdhC+ZoU+W3aaxzxp65TJ9keMgou6qnWVQ24eGDf8Ab4YqSZmZws2R12JoMKS+1C9sUgOqAj0bwl8VtFohUzC1ZYEzYWnj94TomrzCrwDrGUMO6EhdX1jTAJK3DjWp7c6cb43QAOkfhH56oBT0YUMh6s+rXzjCwmWsvnHufYctIKCAzQX7+t39n X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77a0509e-251e-4c43-daf1-08d981a913d5 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:23.3673 (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: w2E6RQpYfdTBoU8R9juSYZFxdlFntgndfXO/5UXH23V5rCq6BmTUDm7LbdZW3sucs++xvAx7tfoLnIXiAJ5z3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5503 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/fsl_mcdmafec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index c20aef4ab28d..e103f79305e7 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -541,7 +541,7 @@ static int mcdmafec_probe(struct udevice *dev) info->bus = mdio_alloc(); if (!info->bus) return -ENOMEM; - strncpy(info->bus->name, dev->name, MDIO_NAME_LEN); + strlcpy(info->bus->name, dev->name, MDIO_NAME_LEN); info->bus->read = mcffec_miiphy_read; info->bus->write = mcffec_miiphy_write; From patchwork Mon Sep 27 11:21:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533286 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=Subp9IbK; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0jG4wBLz9tk7 for ; Mon, 27 Sep 2021 21:27:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8CE448366B; Mon, 27 Sep 2021 13:26:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Subp9IbK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 70AC68362B; Mon, 27 Sep 2021 13:22:50 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::603]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B874C83606 for ; Mon, 27 Sep 2021 13:22:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F6jk/kCPtpu87TDEemDJL3AErW20oHwm4H/6oYFomt9/GKgu/RxI/KJQS+5uv6gXAxQzMBPGTFkOaXstEYEOz19pM0Z/CUHS8hqjIEZz5EhrCpmg8bBJ+oWeniARPIC3aMa4DfXkouB/DCOQT61kLddHvuZcjqgSX+Hlu/xODma0ZlziwoQXTs0PBoNXYyTA5PJDsEsgioyNRxiCt0ciUyGNCxxaGpmfETV7+Wcu8KwjUHc9IdzG6icz1SeOAmRgFqHvgZ865JUyyyvnoYEzwIyqD+Lks1UkYB2gXtfy6qLs70chq7988zMpdGNiccIFqibKRlmht+OXkGS2U7Zqgg== 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; bh=NY2Ip6uM7vFgs7Y0vqRoAZ++2+Q9IowO6GbqtJVtbSw=; b=bsk5l3nkBD92RLkBVFkBQPQBWVt4Ca4BO5jLBxxRN4Lgen3eOjM3cZiR9cDQNBJW0JvOvh4/TYLmu4rBi8H6e4PlL2M3oOYjBA71qeOTxRaqD1gsa8mFTvNiNqIygmjkG04mFIOeCHRi+FEEiIh8S0S5GkPnOihcxDUs2Xi7op1kxOamT5SFVK9SFpcEAt2V2PRrV9whddHZXSdQXitCfwCa7PTM4P7kd9OCprrSKBDd+d6lGNCCiHB1BtJ3qXHE5WZy5jIXxJSgAXtzO0rQHwFKjGynep5uLTTlQi44XpmZinxBKdKci/s6/cS4tZB6zEjvP9huRXzYVjsp4qb7EQ== 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=NY2Ip6uM7vFgs7Y0vqRoAZ++2+Q9IowO6GbqtJVtbSw=; b=Subp9IbKOzDovbbSvQXhXU+5RzPO2UrxMBi8jMGl5iOr2/P5KjIaxeTBAvjhZxLIv3h40mk9IEsno4qog11AhoH9DnIH71Ixw4el2W91r9mpH4erggkc89BgpxHDos/t/awiMWc5C7T+L2XcMijt262UaDb9uuRWnsOlTNR04oo= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR04MB5503.eurprd04.prod.outlook.com (2603:10a6:803:d1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Mon, 27 Sep 2021 11:22:24 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:24 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 10/25] net: ftmac110: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:50 +0300 Message-Id: <20210927112205.301876-11-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c5d7429-bdb7-40d0-8904-08d981a91448 X-MS-TrafficTypeDiagnostic: VI1PR04MB5503: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UEkFF9SWDuNVY+tnU1TWiIoMarSIgTbsZTj2MVEx/f+h+4FhSG7mseVSpm9wRJwkTko97StVAzLHpL06VbaVf1eX9QPvNocLANgojx2i103wHM4hO6aAz4yafkTDipR2S5n9sHwOfHm8B4xKyNJ45TXEapo6Qh7jo2LSB5ZWEu6/SWJBST74IuxP79uBB6SEvrMTAY97r1E55YFPHUe1fn2RQb+9p/yqbJfeFqN/vG6ffcZ/tAbvx39z9JZU5MxCU5Mcm4gP0X7eWDRg3odLw7EQWFgf3DaoTinQUIqf9ivXpYYv4flNPXnMfIxK/NPyDjj7WAw3hvUOcy/5f5GBvFT13n2hLZX+ILkz0ATq0KehCGM28ik8ApS7obTTTzNY6i3hTw09txjhxiwqP0papeoHd0h2Ou4A3/kGR0kd/lDy9DZ87XS4AbnSCvROlMut1eMYUgMGZAGvaNxyObFf8vfanfeTZjBslSiAuqj5eCZvMIB4mFE+HkoXjnIPUkf7FvGGLH8C/pHkfzBkp8493Y8TEbqLQ6DjHYFuduGSmdTsyT2KbsZFlEFlJxVpg6JdCpCrD+RBpgQCoRtkG4HPe+V8NUCBUmPoSuY+NGPdZtqJkRgAphXGs/9u/selhv/UBXSswvwNb96pn4fzYqyOju2KR4g/6R/Er/ExAYqno+IlffZM2BCkSnt6coK7NkZS2ZI8kbahVcVAYhE82Y2HJw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(5660300002)(956004)(6506007)(52116002)(36756003)(316002)(6486002)(54906003)(83380400001)(6916009)(2906002)(26005)(38100700002)(66476007)(4326008)(38350700002)(8676002)(44832011)(66946007)(1076003)(186003)(8936002)(508600001)(66556008)(2616005)(86362001)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DGNaBUnjIDHokz7OvfjE6462FmkZMSVYZcR+DoWqEM84luXEZ/PfTTJoFkKv8zbosxIdDdTJ0G/RkKyBRBi3j/kfcRnaB6yIDF7F9uv3tjl5O7VI2HQHCvv30JrasRj1uDMJGj8CouipZ6l5W1CX1Fwj9xOjchtGSCUzsXG7G3NMhqSGSdn1Y1KwP8+FcHDaBX/gIEAIDNqA8UkJmXjWfG0oyxG9uy0QPWBuwGiX+r5U8jDodnq0tuglkmjNbOgBCpunyCMBoaOqG+0Tgitcxr36BQSGRlM/n+tepWjYTBzB5cff8ttCiIQFaa6Dm13bvhgr1llCdIn/qRx9XxOBZnXsQdnFdAO1hvBNS4AqCEaFs0n4fdnr5/DpAZkfD0Iu1pCPSLnzQR/L0qqUMsps+Cj+Wbt0h1YYL/8YSgdzfw/x1vP+HZ1jFCaB5GIjwPSA1AINTkwUj3VIJboc7t0z6SG0LvpJylXDkmHPjpW8SnQNFoz9urM27Fxf4+3CJPYODKhrIakxyOnG8mZMkTrmAcZ0IbTxEtYYBqbKUHJARfO0ia/fQ1dDJFHnH18O4io3xZPw/7qPDsKeC7MpoYKq4TS6CB6cA2S1eqdrDq+X8xdj8aBst7aZ18tH1q+oKeVOJ26LJ7fnzUEll3ZSXRfy9YzDVWOgkcjsj8aMcVqvjc8p0zlMkYZIMcfzXNi0wwxtDHAxM2jtoRSQx7oUzUp3u35xZuyygP9p2jyYeXgd2NGFtUsHVG5N3pxl6QhWhXbOCLe5V4nnqiKU9dY79h172OBXJ52VaE6u5B4177I9gMfJO2Ahvd2/TN1LuYU0JKq8SKU7z8j6O8raLtj4L/2z7CLx4jg9swXkWzRmh857/b/AdUKtqT0fdHgvwOX34MAdAmBMNwoD4DrxYNfjJogQzWmGrgvmksmilLQw/CSNiEajPhkmsVTMq7LhLmGtcPCqspGvFXCAkRpoyIZSc6DYHZmGaJdSS8nRiXPojnoZkRYTto+ipZ4ntjiprfVFQyX3a9YzT9Wl2iooJzpQo3iJFt51wW0k6nTh0cgyGr7K4hNLfVCVBjOuRsdvYJ6Lnq/WcjubS78FPmXJM3VkaH5Tslh+97rPTpRlcdkdhUUt4XBr8pTwkeBoU5SMTiRSfO7Nln1C4SFTC4kTs5UCv678x8fchw2UzwVgBu9kcXFhOxvrndyT8z9t0DWIgXJmm3OOaOzDnVmhtrQukDp9KTTYi32CmOEUy6x1NFjxR3tqRxz7Snhh1SjW9aUUa6cTluauBNG3HB+yDu7N9xp50+hzNgIlPMdvf9sbGOdl7ytjXfApcXzrifg/54qJ6ok4eUs1 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c5d7429-bdb7-40d0-8904-08d981a91448 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:24.1059 (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: dNH8RUPJ98TrffiG7qOoKCd8WiTD7mRiJSeEpXICisiuLXIgVkJs+wh/QB7B810b5Ho1lIK3SKgJUTaImzEGaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5503 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/ftmac110.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c index 265d813c4f89..7e54d4642ddf 100644 --- a/drivers/net/ftmac110.c +++ b/drivers/net/ftmac110.c @@ -476,7 +476,7 @@ int ftmac110_initialize(struct bd_info *bis) struct mii_dev *mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = ftmac110_mdio_read; mdiodev->write = ftmac110_mdio_write; From patchwork Mon Sep 27 11:21:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533285 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=VQENweQi; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0j02BjSz9tk7 for ; Mon, 27 Sep 2021 21:27:00 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8430C8357A; Mon, 27 Sep 2021 13:26:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="VQENweQi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 60B318362D; Mon, 27 Sep 2021 13:22:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20602.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::602]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D42D383607 for ; Mon, 27 Sep 2021 13:22:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V7H8j2n7onNPBoZizkn+ksh44ZxDkBHH9b/OwaM5LKf1eDlKji1gcu/yfyS/fEUudMI/+wQEQvhwKU7VZwBujWmZFYj99OPWHqlBqOUnv5veK6YTLImZQExP80lqdujhCagfF4CH/gKC5MLAgz7VBQYJcANNJrHqJH2a6JP5ZLPj+5iInUUNiCyoe8ELL71FvYx4a+Nk+y4CbcdjTEtxZpgjJvuiYWTrVP2Ryox3AzkriDlbrwGlSCxVDM+oYFPe1p2L2e5l659hvn8kepG6VEa4sr4GS+UxedjMa7fe9TdEpVEpYlr6aV7WeW/YlfAnNLEqovo11nnEZVPY3Xdi3g== 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; bh=PxgbChoUVmn5uRkQFCZn2+vf+/IoTYk3K+V+77Yc8/s=; b=WBm8YHRpVixZCqs6vlbL9HWFm/aTPFI79GSHwXNOf4iHgSiCUaM3G79uRz1YdEAoLB5jpPVI/3EyLSQocTJ/x/ZiGZzJ+HZ1OjoKo6c/vhsOSt0cSoqz6YpXZztc3eGsz3+8dfC8McWMtwJokWfmPsViPSzxqoPN3yAVt/IQheg7vGWW93peu81r3Cid8sT38yvF9gcr3M2WYQ3/h7NTLT4kZ3RjQCecppPhunMiyX6EKwMF+mEmLau8Zw1ERbk39AzdGxZJLkwJ+Evox5xmwBvSn7Q/aGQhERDYizAJ962QZ8ckXbwQ6sNj3Y4ZkdRRE0qaCjhZEr2bnSeECk1XpQ== 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=PxgbChoUVmn5uRkQFCZn2+vf+/IoTYk3K+V+77Yc8/s=; b=VQENweQithFBLqjeSC/FG4Y8vHs/T89yQr5hD9ydRsFWNa/x6iBIBcgeAzICwW5JKIvlHsNzph0YPhr4fbrsfxld7w7APq4pqx7M4rSHh/tnBYVYM886CJc9r1z7omLv9/I58OGKNH8NRBePijS+byf34AqmlTAgU9Jq6Uuu9d0= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR04MB5503.eurprd04.prod.outlook.com (2603:10a6:803:d1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Mon, 27 Sep 2021 11:22:24 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:24 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 11/25] net: lpc32xx: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:51 +0300 Message-Id: <20210927112205.301876-12-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a07fec82-df53-49bb-cf7d-08d981a914b4 X-MS-TrafficTypeDiagnostic: VI1PR04MB5503: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a//hnc2TA3ZS7fC+XLssBgwbrv3ywIAt/FjWPo7j9GwBKorY6h7fcdC4dn495/JwKCJAbleZeHJH1UsfXVJ6aDD6jMkV1xVZ5HbO+4W/1G7kv9AAzn0FLdYSO4bEjsV804yflFzz6imu+3zyb85vx8CU0SENDXyvS4NjBfbD6aMqDXUOiOkdSofcXtUpjZeR9ewsu2ao3Tv9kyeAxufeWHXH2RXrxRIYwNF7l73iBp4+NuK/WVZrhUKXYuCkMVZFN4HV8eLl52RMRonmWTKhL36FgLKhPeBM01Bqv7uPBZr+0uEtog5wujAU4VEdtT1a7+inBdqboTkXU8Ivj0BlR5cNP1i3dA14CIu2X2rycUs0HwCu2HuiCHexU8enJE/TNchvax3aZfSHN9Do/IEFC5sDROLblbN2KyfhilHbjrrXozjb2EJHpbtTdRTqOG2eLawJn5ivZsB8IlY/mw75sitpykXbb7jiOpjqkrnXaR81Gu2QZDPaNScPwjB5u/IDrKaLhhPVJF9vYrLAz4hvm/JTo2+qrbms8uugODndZ0vfmEpO51gtM3W0UIjnsu+3PxTtKLgcQCZcxYzDjSp/PjVU3dUZUNT0YS3rGt5oHfoENXHclzVNRi31VWJ6VIVY/5TpMnW4f26Xd1AsXh20mPMelcX4GtPCkVGm2xSoBe0Qdhc7Dx5lx2QDYXZGmSHi0duwSweMZhMTq6zaLgLRbg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(5660300002)(956004)(6506007)(52116002)(36756003)(316002)(6486002)(54906003)(83380400001)(6916009)(2906002)(26005)(38100700002)(66476007)(4326008)(38350700002)(8676002)(44832011)(66946007)(1076003)(186003)(8936002)(508600001)(66556008)(2616005)(86362001)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pItDtA7NyPnFK3smF9KICN9NEj8Lkww59ukOU1hhMSRdEbUQjFBf5YcuxO0yKrpfOTUAq8EDIuRkymvk3iSpn8l2eh6CoeqxDMsu/WHe5/RMTBiwi4u86sI6+HArDr84gYUzfI8zgdxiPUb8poxqxZM2npGZloSufqj6VyUFGD+7hPdIITbe5lUu2yCSSsKT6FfNnr0oWe3Dgm1fhSj//U0j6i5WZVdz9+j9Rdnv8c/tL76veEAeBDhTascUxu1cubJtapObLJA1qtMyuYXvq41SH8KxRy5Q44qHOj2GzOoMFllT12n3SO66nMyytrejTqkRrZNNsidGL7FNAUFO2mbjyTRf1095ocWDQEtxuvdar4ay81NtbHR1u7cISUESBCVUrPCizGIVP8xvTL5R1bgZajZFpWcE4JPuAJt7YU2eStgqhxdfa6+W6CVyXnbzzcxWXqV5DXu4yLjUMzdZLGfD/IfNMRxxWRJvlAMs7/fgL7sOsVmaqB/W2oDpwZxmOdDE7YtlXPphrQvOuu7Nao9o3rRwhDXOF/tP6gSrUXJaP1u4Png8unObwtayKIHOA4gQkNX0GxGouD4GboSdBDQfZznsNRMeIkpleOCAfy8TLSEDvgeqFSYPLbP1j0cauLPXbr9VXSUxHUryJa3h+OQshTdxtH1aRoebO1gUAyFnsRdwailU1JIYJxjINIH61O3FzHE3QvKfefDMZDJZR+/oVF5cNG8ObeJrcARGIOEB64vV+iq7YRQVVUVrGsfanI6ewfxOqXcg+7INGhLrJo9xlTaQa5XF+mLQC3m8R2XcNLnfSY+ciRA/7hb88ZcCCoThEo23P8anUU8Vu8PKiN+7xSoOhP5OVhgpatl1eROgRWkttvgkppmyPYLCbaSRECriDW/zQ1vvbcsggX3puTgsQvsl2VJUdsoXj0HLzBLf3Au6QyXXUonoXSFEMNNdEWtd5eBa507lXJ/V294sukbevSNmYFCJ87/W/53sDqM0F8VP2EMUkE+SRimql3b0th7T/pgok7AFOpvIIzZ5WRLELamSl2+5eClPJKNkhiLO4x9IY2lVeDdPLu/ofz+yQyqOg0cVm0Kktn5hlD0qAHznP/2N5yLVFWj8mVE/fnaUYaDbA1/9yeoSZftuZ5za3itfohyRwmLv5DQHnc0vKgVy5KtXqVaUVfM06L5n9DAGtLzFz4ZrJpgwFJrxxgyLV7ve2Y3DpTCc/HszRMJ39wIIy5Unm7DBk1Sek2OyKD67TS37jCXOXfJVSJrqmhTJPIhIODl3eX6JjoC82B+G7xjM7JmN3Aj7/PkUeUGjPVmYOLfglRiFu+uzlQBCYXDa X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a07fec82-df53-49bb-cf7d-08d981a914b4 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:24.8924 (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: giX7ZyRrMOZnC2IvLH4cTDoKpGBXzPKiNcwMGxTDsWVRU9LUCR+xuXzwuw5y3pVDCd69wMSy98a1A/Xav3MAEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5503 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/lpc32xx_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c index 3f281a515c6a..1a5734343935 100644 --- a/drivers/net/lpc32xx_eth.c +++ b/drivers/net/lpc32xx_eth.c @@ -638,7 +638,7 @@ int lpc32xx_eth_initialize(struct bd_info *bis) struct mii_dev *mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = mii_reg_read; mdiodev->write = mii_reg_write; From patchwork Mon Sep 27 11:21:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533276 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=Vfw6smTN; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0fm1rgBz9tk7 for ; Mon, 27 Sep 2021 21:25:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AE24783641; Mon, 27 Sep 2021 13:24:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Vfw6smTN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 04FFE8361E; Mon, 27 Sep 2021 13:22:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::60d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ECE8A83604 for ; Mon, 27 Sep 2021 13:22:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i2vL2yCjnBOF3yWeSs4fwMyL8V2o1uyFOc8AERf6zfkwOgKjKpZpO8fDqSeI9jFr84MWRScSIQiusCXuISLyBHiFeKunzz4WhbJFe2eFz6OeeqkTkHvb6v/+77u5RW0XTEH9jlezOZneCYgwWHDFdqumudznPc5drKOuMg03x9skzevlxhkn6o2mcqX5I4iGZ4XcNNqPX3FxioG6P1zvFIXXD2Nqgdqt7oO1IINa3qMsCg/RYU+vv5AZGjkvxxLmBhbkkqhwItWI1oNfxuSLsk7hhIPIGgm3XEAeQWOyMxzGwVyEQ5VsIT5P8rhXVnhCefg2VyGBD09dvhhOl0oPzA== 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; bh=l/d3PJGWd121XwE3Dt0ASbpOPTHspxASfQV8r7rsWu8=; b=M/m4rHU5dDu8foUq+m1j9qLpDiLI4L3o/+NY+jwF3GW/KwoUW0e6Jc2eGFpPC7W63McjxP/L3FtF7DE3IVwHND2CXiAb6wqgaP9wIwa47kBQH/M28Ncxk00lgFuF3Rh81MFAvAuqf1dDzshIxc/coFK2Vmi6SdFiAhGEHfZ7Bc4FRfeIG7HKj81FBQRkUzt5wChEtmC+AyXJJ11p9W82IcBYB0477WUJaS9WEzE1IfMe4r8VEM6xV7YJIoGyeIN3RFEPklNcwYINLwtA8Zhv4Lnlb9o+GYtCYWlU2JrRVDqbiNbHx1KOecNjx9FaktbWQUlH0UP0s+chObjCoQc1Tg== 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=l/d3PJGWd121XwE3Dt0ASbpOPTHspxASfQV8r7rsWu8=; b=Vfw6smTNRnsq7kmOoqjz7bt7gonQVtubos+mvxAPFb3IKhuefQmb1Gh9MRQfOhX8HVznfOALvDEesepSytkSymrnL6JtAd5qsN6Fu2OmQwpen20uWzTWAe83D/m3pHim5hdd86zrjdoVgffpGylX6BE4+TDLrkqgn/jT2z9a30I= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:25 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:25 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 12/25] net: macb: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:52 +0300 Message-Id: <20210927112205.301876-13-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18f0af3f-f82c-45fb-e0cd-08d981a9152f X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tMvTTXXQuGu42rh1abyua2GzRTWS+NGP0to5ql3DiaU9qZqQD8dfphJ6FmkyQMmzbY0KkXUKTygMcNQEypcwUrflq+38TtbWQ7/EPYQ3pLZ6TO82RLFfYh++DxXPlTqoR6Z4qios5T97b65rnTcPjEcVxbzk0WpuG830/U2GdWPt+6W1/HBXAcr6OffzSG+3MtG+8VdvqLUIfNpBLN28OVquZcZhwkqxgUNXdk9jf4TYrUxFefhuE6h0bss49GWDT0NWa+0TdSXG0GKsm7ldqx0yuaIjuLxAj2mzQY7CQsv6HbrACWjd7MnX9V2rvdT/ejO+WFKkkDLP5rokcQbaiJiaapgJkcv1Us8/6u+7201EeQ+bTwPQp/jjpGOpDu7stpYIBeHbnvNvXw3XxiL/NWetB/cjKv8dNu5hJQNY1pnlS59Vt1IsB3nir8ihmIL7Cj+TpS3Mtfwt9V1juwdNsXYt2hYs1tiNpifArzYFVcgZA4Ead/K335Esb5FLzNA1rpEHuGVRHXaP0lMMqNpHTIL2qupaVCHC0iAMfn4+u3n351V1/U4lG7dO29wnI8UJlQBxxGFUIW2rudxR6FEQAzflvz/GrBe9yYGh7S6PRk8GW0YUU0noQW+CpxsFCl9+lpKiO3QWe3rlgIHlTmWMQPeGRGpdPD58REUG0+nexksvinTQAfLxq3llx41D6l4DhHLeZJVqTJ8ACOZCoeTjTg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 41gSy8+QUtggL2mRMhWKuCp7D21fadlqAG7Mol515bxhZsts19wniletlFq8lNui9APz3ocFdGjFES7uP01qJVJZ4pKetbo2K8rQmAsquhQzpEMkySrzpsDLDT8GJw0RMxB0HiuOT8s7OMH3OtVye2Y7EKqEFdRdlXkv7PClrT6rfyEP/OTUZiOSX1FnkgjFP5nYis7XiOGtkkH2WBcMWfhvyJ4Vyh4ppYZAvGvP12770e694ovLLkQ6pezSr3jo3B9EmrkOQ5ZGNWR9gHCqhYlDeQiHxr/mchyFaIyunEwPwQuq/4ys17EPPmk6FbUDRJwhu7aH33VRRRFKa1TMxRcSGHnGW5rEVvVBTSGWLR48111134b5LsVFDN5HhUclGkkYyNIcpElyQ0w/ko3aKf6/rxgtvjIU5B4UkihQRf3Dy28YPu5llyyKVsco2AZZP2ObDeOu7WTfpKCbcq4kLGbnQw/m9UWoqL2T40g2Gu4IPA/zglBanOTNqX4O7sPRg5pt44NVswOaFRrVvccidqW9Lq5rcM2AK+6Pj2Mqygyj3pQrxZ99A9d2ot0ioKrey1sWPhMxj1OXwH7YDFSJ7HWHqLtuy06oE5L5BAddL7SuXTfKOvbxQojBBdpfOHEp+0cIRYUTE6yJOGnqu732Xfl1m/ipEFO7hG03eD3j4mMYoJMYlVos6fakijDa7Mgk6Y/p0qbInDjKbJF9U/jzb7dJ4uxsRklxI7GwNmvw+8JVAMR4xmkZxv1g3l25YteszbbsXLD9CT1nr2uLbyvO92bPUwORQkBgpFanePInGcYo5Lsrkz9aP6y8q80PEiS20Ff6EBzRfIp8iQGX0kJocLa5UtkJ3kexyeix0PlzyY2QtE2fWrIAAgB+MjfDNg+6xS68LsmHtFGuLDDqWUX7qr9bnTHAlV5pQ42OlBvMqeakHneA6sltD2jlOXjWvd5Iiq7NMhl79SSh2RV5sANJHMrkMNeOFDixDIWmQCzNEPZO1Vrf/uwvjtwG9OdZZeW47V54Rzexi/V8x1i8lNoZiVv69n7VEydEmLv9yrwIXnuke0PYJFHd+UmoibUIItzBxack2foR33eJKDanKuqbyhZJnZiPIuhH37i+oqdfwSAegFmHqXdWzZf+1lpIAudYyi1+RPD0QKaVBeUipNTrArh9augtGNx7CasrzrYlHwW7IGYt+grFVvDE7YiWRAw/+lL4GkXEuNotXQnsTjDO97bWhxiVpsWsVScHe6SwNc/8FVvP5xRBXT/ljYHJahX/wOgiwDZShjwvmHf/7YonU7bPpYxOW0BR332CJeU5c3L7MhRdjbFlLk86cXNe9YWn X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18f0af3f-f82c-45fb-e0cd-08d981a9152f X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:25.6000 (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: GB9h84vDAAVlf+Otsp7NxqW3JAl0j+LaG7dciaGJxcOLSyWdsqzryaLO7yLnhvw4QJrwcf9SOOAAZPZq25ltuA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/macb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 57ea45e2dc7f..8151104acfc0 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1245,7 +1245,7 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr) struct mii_dev *mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, netdev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, netdev->name, MDIO_NAME_LEN); mdiodev->read = macb_miiphy_read; mdiodev->write = macb_miiphy_write; @@ -1403,7 +1403,7 @@ static int macb_eth_probe(struct udevice *dev) macb->bus = mdio_alloc(); if (!macb->bus) return -ENOMEM; - strncpy(macb->bus->name, dev->name, MDIO_NAME_LEN); + strlcpy(macb->bus->name, dev->name, MDIO_NAME_LEN); macb->bus->read = macb_miiphy_read; macb->bus->write = macb_miiphy_write; From patchwork Mon Sep 27 11:21:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533279 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=i8smepYv; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0gV5NCGz9tk7 for ; Mon, 27 Sep 2021 21:25:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BF27B83652; Mon, 27 Sep 2021 13:24:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="i8smepYv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A9748835F5; Mon, 27 Sep 2021 13:22:58 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::60d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E47A283617 for ; Mon, 27 Sep 2021 13:22:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XL7Fbmff2sAu7YZFu2ZWSLqI/VjhVlKHeDZLD3kZ+v2GJp4ar44RQdfwmPfvKD/MLerqhpX66pvIaR9UQKWlParwbXinJxIH1DwJp+iEzcTwdF3kkWho4zqJgDxOSGSnpapzHYkYI7K7IHgDycveqiv02Hvzr5MjiPy1z2HOk/vCMSZWjAS15oAdPPXkAzM0q9StkMpeE9LrvpdsvBy0JTwU8Aky1Jnic6k2P7cLQ3CgT9K3R4k47nlZ7jxuA+5AVHrRXk8R7t1deJoisyrndR4ljDEaJac1quvYKP/8g9t8N4lNOl955cVJ3rl5PErpT8vFMgNxAaMLrODmo1qp6g== 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; bh=uwd/mbU1IV0aXRVIvHU9Ia0dApdYToWc/SSpx0xKtPE=; b=Rst1wgwOlXBIVbXAUOGHMjZdwv1GB7VaGTYRA2wS4zngjLmcKDHhMsitIA/vGLoXaHHI3stUUFIE6mGvepKLGDlpACKpw5Vv5rsSPAaa44YaP8vQof6VFxozf6O8ysfOdbkxwpSioFrRZ6ePVTw7ve8V++NKbGiglKpa9RSkRWCzdIK3Ruv6LJzLVsU8FMbApP9HymvL2m6m9Qn/28dfuILHVBI1oEplIWz4rAj4R34DDI4F9VAl3pLqrDmanrIKXMzSbmom5TsP3Kcd6AS3W16xpSJ9E643owLAE1SPh6Exa1NXIVjppOJqFAtm6MiwBWVUbOqWvG8zIwDCJig9Tg== 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=uwd/mbU1IV0aXRVIvHU9Ia0dApdYToWc/SSpx0xKtPE=; b=i8smepYve0j0uHG18JySZqGWIHH5D54PKLcYVpX2l+IDxdKwVFe+9Dm1iF0Mf1uLfkxPf942IKiUfnAbsnu7Qnne81WvLRFJ3uUtM+16s2RG+0ythXh9iEL9r3xWiflhHhPWByRxuZX7TNiYbmpP4vXW66QQNtH+9cOj6LJKfhU= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:26 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:26 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 13/25] net: mpc8xx_fec: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:53 +0300 Message-Id: <20210927112205.301876-14-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 95bbd35f-0012-4694-1176-08d981a9159d X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v8fqq31TiXUlByN1XYxQj5J7IIonfLihC+sxs4u8bePj7sozyE4IvwLxFSL5llFK1jqWZKLhIgtd0kCffzY4wVoajcF4qAABDeg038apBWPhMEoua++YV/SJOXxzR0oo8ZbxiZypGsW4SDd3mNtsHC52TiaVbb5+UUDcmlu7SIOAggQllT9uJl7sROD76xTAELJ+GpjJ5QQivJbYTfSWXZh5uIyyfAOSeAkTrBuZ9Ep1ir5t+Co9Ks3C7pnidF5WB2Aftk9ahJieuCqPIER2ETjcFWWV8YySjzEVQ0hpEXr4yn17iNAdm4UAfsKvXYNPmVWekBZZXWYoJr+hEtGF687VcTGg4iQlp8DOVn5NVHR8MAccYJjWl4qspKjUUuvNAkpPm7tskfN1tXW8pMSVUr0vJQ0d4fAG6R/fu7FrU1eE+vkpXTetZF1ooPjLfHKiPLno8Cr9RGZfLVuujVzttG7BszMUM2O7rotnzPeJSd8XA/+SKSVuyrE+NbuqsBPhD9Tv3OHv8f2RamVEfeJFWLsFRGxhciZ2Zt2qQHxXM/3AcFtqyb633VZE6wdu1A3svTi9j/hVn8hjoIjrhhgKnGpS9utAsza15T1G9GLJJNz80Pdl2RQubKVf1cfVi2tNby79BjpvzQGQnrGa/Rk8FuBc1dcXFb2Aeq9UhyjXDQtK7pVxkKiUGacfezKq+x+M4tml8UUfv9Gd4xZbA/fU+w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +XZWsrM0rZumqyB5OaOQWMfHgZakzaE8G5XXl/W3zNO/qwaoV2ZCahGw2pNk63vGc0CF1iKxuA5u20sB1WoAxGOxPljvlWsRX4+jdAETtru9i73Lld/alUJIEmr71sL5zPDiCsfrU+7ChS5Vchj+o7YxeTb6ooQ2KlGdFz1jWFxv4co5NcoZPvIivemH79K0We3C7uMQn5t+eb0tx/RUv6Vqql5uSZZ2/Z3SDn3WzOFxQC2HryyhHn7qcoNcC4Zh912JVoFoJDfYc9wblcvmgNW/4U2/puKnCx+hfFFk5FoKT5ClBqCl/ILyDxs3r72u4Sa5Bb+lSgDMLT+aqJVxunEQdZXTStAyEgegOuQ2+Xm5BYfPEm186nS+GnIEQpauDK6K/t0ZopaifeAEa1yr+BOc1N8DFAu6s9aeU91mcX4j0uDREDvNyMozEYab6knafVMbNZphli2ibLbq/GdIGk4KEjazB/xWHcgGl/Ux97IUBZnDmjBvk8jtllhSdCrV73xLlR9wn+Llw2mbOUNe3muOyJn3h90d3MFYqXcriO8Jtiza9DLH/cgio0v80oar/pHrSQb02A6gRmZoNSY47O3ca417bwpdks4dfvydFATzk8qY/PrGd4FLZtGu7NUJ8uBlBah9XL3m7IIbm3cEgsGgICh3jcqZB/5uMaZ3JEc/jGjIv1XmNGu65XDYFrgGI2NswRKMJHLS8PNqVn6QjacZVTaBWKvWJtazQWxrbDsJdKYYqrpKKTd2j8gbeOFtoN4bbI/x/SXlfS3bn/8l4Bk9HXbrEuhZJ+YJ8lNxsKipmPnuUiyeWUpS5itZvA7+9YXdtXEsxItqi03w9t3Y/N2FAEpynAmCiZgwc+r1aByLjNnYBPA1DyWMUqbVK4aRcG9DFobD/VY/Zkf2nssqJsprMYE4CBF7tkx4cxIisl604415KkDHhIy9PmtGVUk0/PUxyQcKkFcEePxTMHqhNx+R6cbDhiHR0lqK3vP4JqX9Q4FfxtqYH028SiXjLH4quMGqnASGOFDovSGcJSMI4j0C79NyO90T0Qz7Tp4sQowa8PJ0rHk+8KWMCRNphkPSs104cC5RXIFIHhlkEyB1jCwfFAwMBRgkluYAj/7u5Ne2bViNgDx5B4aVcKCfUfSTT9aMhko80MBSQtZGE1IdoHyODNlGTlP+9pRjf9n8JT9HYpTsMIbCbvRy8E9kqcy0ik1g/65/g5A8uY2ZR5cm6qWnZUgEwurIaG8Ie57YaJ/drVThBFyJntBReryC8ZJ8H6/vcTUIjmgmC81FRwMogismDrQWYajK7k2+JX0kd7ms1BgaMMriSAJtvKbzbarz X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95bbd35f-0012-4694-1176-08d981a9159d X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:26.3346 (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: yTW8M0MUPHeKjQk7aeNZ77YGwNBhVJsFlHuH24XTNQHvo/fmik5VQKhAHEhdqAhOFViD6B7OcpF7WgweCzktpQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/mpc8xx_fec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c index 282c2599d3c4..4eb826028111 100644 --- a/drivers/net/mpc8xx_fec.c +++ b/drivers/net/mpc8xx_fec.c @@ -160,7 +160,7 @@ int fec_initialize(struct bd_info *bis) struct mii_dev *mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = fec8xx_miiphy_read; mdiodev->write = fec8xx_miiphy_write; From patchwork Mon Sep 27 11:21:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533280 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=sUPaoK26; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0gw61xtz9tk7 for ; Mon, 27 Sep 2021 21:26:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 033A3835FC; Mon, 27 Sep 2021 13:26:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="sUPaoK26"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 579E88362B; Mon, 27 Sep 2021 13:22:59 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::60d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3D23583619 for ; Mon, 27 Sep 2021 13:22:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T396s73MaNF/+N6GiMdJSi9yl1ClBtLrxWoPYFCgLWtpSSc3LdgrUIV4tkcSEX5NH9dCIT5xYYCCvsytp0a+DEle0XM8V+hcLvpkzG4lKloeKGDiDh31vnesCzjeNa9fvAEjqtRaZ/H+jcMZygrcSGI+WzI5uCEF8M54i/hm3RcSa35ZTfKB6nTFa46OzcQKRy0eWPHmjcXmGdjqh98WYfT1+Va1M7WaISe10NlOhZRw3ymkjCOWJBQOoCptrk0NKZn+geg22J3YZvfTBg6D6duBQryXKpesQ6LZdXEKPgWzBdafsQ4WXDgo/RNYWclEWJUyKH+HN57Qifm7w5lOxQ== 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; bh=QOqw7TQQD4MhbbPfKXmLtuPooTRFA28mTgkzcwkIsEE=; b=hWD4rYc2fkG52z2uPmeUqHCtrc53932rrYlRV+wcha+NzQhkB6auSalz9kU631HSjj/Bzw5LgHYkQUEvqeWaEy9i9G2bQ8Fvv2C6sfQ2aEKvvKnhYB+aHRFwhIp0zeO6Ivwe2gNp4keWTCWaox6Ppo+/KBQiplJfSzRxGV1+MuH7MsMX3/cUpizvsv7KBiwGDpMs29kU9ZRUpQRFgvJYSVNkoYhgS9EHMb/rwCPWShsIFyfebS6LA+WD7Kw2XERJm6kGc0PFvcpOeT101WqzuR/gfjJI8kPXNbPi7nRNEVERe653r1dhg2ooBNKWOFFvPE2McvEuPqlRkptgOJKACQ== 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=QOqw7TQQD4MhbbPfKXmLtuPooTRFA28mTgkzcwkIsEE=; b=sUPaoK26TSm0KMvtIyGa87TFIaWmm97wbMPLemb+v+lffiLy1Y162ZhBYkdOMVou7lNTn5G80XkgeUOd42mN9b4PRsuUaeXLCsVzdunT361ECNz/cLLBZuhZ6rRsfqMioAUni2SQ/Tv01ICcEfCcezFCaR4oW878HSySL67RWxo= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:27 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:27 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 14/25] net: dsa: felix: ensure mii_bus->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:54 +0300 Message-Id: <20210927112205.301876-15-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 70e09398-dc88-4561-c408-08d981a9160d X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q+hMkoDKMC9neVB9af5IYFuccDnXJwOqaWT/MC3PZTzGeYFMyGzpBGnCkZo6XUdtGpXF6Js/ckcSY3OdfuL0vDvm3Xeim5kuOOrvI/xEGHq7rTAeqGp82p3ygqGfp2179t7oOgnTu6O5iGaQgMvM3r5/ZR0BnGcsfaPszdoI0TryEsm7gpxhT4MHedqbSEAWFw5Y8RqXly/CYdxwEuPlCRvHgH6a9xgynD+LpsOZ8zxT+Ou8AC7XD9YeOrdEjZS7J+7TC4+hSn5TLdjce/CSzQu9OEJcRlzB8Ia8rsdgV0P5KguSSKxrFW+2Wpe6JOReTC1HjfeDNYrNSEW55ZYGSjTVaROACxPjXRjoiZZfiY/9CJqFGAJzwBuT+L8ahW1ClBMEcV0ZiQcpKLrYkKDd61xO+SYfS7b/8whSgsEhSvo1rNI0bpNAu6Smm75Up2n0n4aElWUSWONlU97IZJgyAKwPqL0OsEGC2P3q8xojDtR0NsS4R+2kaxOG0kPkDseHPF6vqSLxn42GlNgTjYfp5CEdPI8Wn/N5qgWGxVjZuhyzzFckrXT3WBpyqxLl4GBqmPB5McKHWNMMeoA/BL9NGCQtY3YGdAR/Y0okyvBD0Mq6C/lusQn8pE0/r6KOtIqL0HO/dH6qyG6N/B//Akg8UzSQIyiWlVbPvlWsSYdiLQ9C0bXWoEK4jvHUAqzOgMD7eUeFFI4t+FK4kV7ExYaOpA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7oYi9Jy8DDwP5BnPxwda1pcZl4IN9iuMk5Of36kRnudteIgsduuMq4iHpRQBBrBpsNvuRQmEFYzgvBw3Ki4og2DaFu/y/fRGoPmpR2JAOvM4ZuT7dBjkLemRkVyvJy/AqP/kNLFSYKa8RE4bIzmN/RSLaMjJW4XmQyQWzajj/smNkCMqQdeFwW0me4K4DiRD5njWsMmn+2WpSY5/pRk1DIj4JYhd3xfFFM4HSaVboUu8sNcg24Xz9DzzD52t96OK5j1n39UG4lMFsSvjUjZflnmpxORMJvRu26uCfeuHJqbJ3QZJTg5hlIDhyzVLgLa9rNMg6D0Na0dDpGpPEfGOttUQqD+pBbFVGF9hyG8QsyKtvCfWM5Id0v2pRCzpxnLef2GMwyGZU3j4Sb2Ejdr/w4RwPpIzovkQDgTOc9Kqkz9sRYmySLMXO33lpkNSbz65R+jv0I4FBsvPnlnuifNTARu6O79jEihh0zIb/y5Ac8F18uztyghzpT7Zzy2BTV/oK9WwVEjDK0Kt14YntUhvyizoYG24m+lHGHHK7BUIWPOSiwxqIU9QCxihfEIP/zeAb5uSTjQzRVPvVYAdGWHgMQItkfbGpPvqYgv4kNoiXmXKDqOs6k80nLvKwn2BGqf5BSX41usO/e4ueu/S9ktYQpI2eeXGKWeS37+4vF3ewDdvlt0m5uQuIYx7+D13YB3hWnXLixIOnxIEgR1xVAg/70ltslcs8xqYDBe4QN6tuCUnB0STdMtRr3wo0N9ZWfoj1ykqij/FobKGTYWtbenLZmpdxT2TJJjYYxtmv9HtdG1/q49Yc2ocJhvj1OEzNh90lqbMmbpzxJbc3soxxyczEEnYkTd/oPzgIwoAmKKOfN7QTjd2BQvXOl3p+6AEzMQB5vPr34eSCXOOxAu0IumcU6cfauwOMinyRhWQh1aQIhFtzmw2fnQA3Ob0BBWJH+J5hwPCFvfahMEbfoFfFMiu7jVRQHRFYg5wesK6BPSsM7dns/giDiDQgAUinHZCQzh0yOSzgYYSVh4JX5g0+DW5qR95vmKi14xWOoEmJ3rQWtkTsYAy2T/yQUhYZSt0r8SZSTEXRqlwI9nsJd+7y9Ha5YjPOOlntcSl6F5JD32nKic6k24alMmzjVNTnZO+4SpmR1776b6G7pos06NfsjZsYThYbqs4kFLhFm8MvBlJ1yomvUnp54s7xPqkUK5u61DYS/Mtm80U3FOG3kxLYt4LDuQVJMBU+UZHKzskL1ZQqEVcoG/KDHxNGbRuoEAB24IzykU3ShK9W2gobvm2GkcAYB5284Bb1aVvJ2mAPv1GuUJb4LCLZGl9LdRow0WPYSs3 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70e09398-dc88-4561-c408-08d981a9160d X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:27.0641 (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: 1uq1Px0WPu68f9SV9yalV8ZcRflls2NoUlOYl0CdCL/JKZXb2dRQSWF6jKEk7/EfgmYNH7NkIZHw/3HhjHGmNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/mscc_eswitch/felix_switch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mscc_eswitch/felix_switch.c b/drivers/net/mscc_eswitch/felix_switch.c index 6aa79784460d..4c2e57755967 100644 --- a/drivers/net/mscc_eswitch/felix_switch.c +++ b/drivers/net/mscc_eswitch/felix_switch.c @@ -258,7 +258,7 @@ static void felix_init(struct udevice *dev) priv->imdio.read = felix_mdio_read; priv->imdio.write = felix_mdio_write; priv->imdio.priv = priv->imdio_base + FELIX_PM_IMDIO_BASE; - strncpy(priv->imdio.name, dev->name, MDIO_NAME_LEN); + strlcpy(priv->imdio.name, dev->name, MDIO_NAME_LEN); /* set up CPU port */ out_le32(base + FELIX_QSYS_SYSTEM_EXT_CPU_CFG, @@ -303,7 +303,7 @@ static int felix_probe(struct udevice *dev) mii_bus->read = felix_mdio_read; mii_bus->write = felix_mdio_write; mii_bus->priv = priv->imdio_base + FELIX_PM_IMDIO_BASE; - strncpy(mii_bus->name, dev->name, MDIO_NAME_LEN); + strlcpy(mii_bus->name, dev->name, MDIO_NAME_LEN); mdio_register(mii_bus); } From patchwork Mon Sep 27 11:21:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533277 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=kyaQXfbN; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0g267dwz9tk7 for ; Mon, 27 Sep 2021 21:25:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8DB7B8364D; Mon, 27 Sep 2021 13:24:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="kyaQXfbN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D07808361E; Mon, 27 Sep 2021 13:23:00 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0609.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::609]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CE0728361B for ; Mon, 27 Sep 2021 13:22:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MZkPbZc31JtkzrTo0w74W55MjmkiWhzrxWrA2sTW07WvLF9OHYU0NAmx2iU9fvPMCdWOMAgh2hEPIgUk/X40Ne5q2hq8UdXsXb3QAe+fFD9Z59p351m8UXJf6JXjTS2co2VcpeFrGbGZBOmQGUgZHDZ9qdj2LLfgQfkAgvtOFNzMK7fdqvjuGcg9Fun3GS/FML3DVoDlh86rfYg8GVxA/rp0OHmc/7DthRFydb5rZ2hVO2p6dOomHDECbfyMq4lT2OAqsyaZYFlVc/ILdctZoksEy4zyox7vF2Yw/hj5DRg1+TYoYkX5KAtvHwcwKZDFwLOSRUgFqYadKAHaxLXMPQ== 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; bh=133Im3di6lY9eNQMtxQu2xKY9ilM2mihoy8Hu5eITVE=; b=OtGk6HsRBqJrmV1o5xhxFsmF4GaLQd4MAUcAj8JP9yGTYfxeHKtrbeJ4GQCKwiX1N6yDssZyZXcUNcw0Njw1cjfJ61xZouhaeWuK0JkXu4HDrWXiAwnO8tcIp1JxQEkY1T/MV1N7F5Yzx9Z4kQR+wetiBPXZjiXC2q/GmcacCKEj8Qm2XmPvEn/+4rENQg3tPczJe5efoNGQtjyxiA7dI/UMeVb5sXutKDIGn960K3OE5Pv2QCcCG6ZuykZY8rgm/7Yx098GBdzjM/+5Y1eYyXc6w2gjctmZVmKLUxsr3R7MFVM352iF0nyndIb1NanlRxP0LLtU3H5yAzPlHiHjyA== 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=133Im3di6lY9eNQMtxQu2xKY9ilM2mihoy8Hu5eITVE=; b=kyaQXfbNArQOkFcemMYZ6G0BhUJzXIvo3pcb3n/h4Gbj5hvWwr4tO8q5GQMWDG3eA5pheVxH4VEMD/LjustJLNt6Pqp9bJi1NQ5w2ks3/ySuZt9B4yp4VjQi2dU4x04aybvpYhEiUUgFVvqc9zK0APO5hROzlcqhcXz+5mBqGYM= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:28 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:28 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 15/25] net: mvgbe: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:55 +0300 Message-Id: <20210927112205.301876-16-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ae794b2-1ebd-4cfb-2411-08d981a91680 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1ZyPRKqv22iobSenQ/mN0p+yP/5t5KQWkdxClmoLBDq+nCZfRJCFLYh7fFvJWUefSVYQE9i5SmV0FIKJVX8urR31sX1Z0O5UOw5VAB3DdoO7+XLeyLkqwptSkcV/LMc7O3n28qXwiZfJDjEC7D4tlApr37A6BzdUTBnc0ZrS/8iO4buBbchaunmL6iO0sUfWO89bgMufLj9kwsqU3/N51a3pdCzt7ut2n1MEB/kMgDp92mYLYZIsXCSFn7JoMQNVbHMkArsmI4yPCJNsdejL0QabWgLbt/m6c8Es5OpfHhnXSI3yn6cnQNrQuGt9+cBu0vOvGtTaJpne1ga4i4i1IaIIo+QYtPnd6vpXbqLQcDq8BHEysJ4/D4/hYmKaXs9p0V2W8LIOrWctcdHt4B3XmBYkOMddzzGOjtfbHkH/rhnV4Miwpd517a5sXqpQC20SsYddcFp5XFTtBFKhc4iYUJt1XGzjD03mndxyIhuxa2uH6xGdme8vJHsSzW/Dp0Hri8er0WCihjdtn0bBO3uRycuXfwJSyKoYOsyhRzTVjInvkHUPgF3Nmazvj9t31dPtvs6ynVVjYppWJJBeKCkw7mQUcq+rAkS2yQ9wnB3zf97jbYKMq7mTplOXd1zoG/FlGVP44nq3GvKBtkKxfSM4ASqLvg5TIEDgGJ7llnCdx+wyJho7cbafGdo5K51YB2BIvgA0HN80WnfFn1/ulQGsIQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WzRRMoVyQJm73u8gwLMbEdabcwhMXoSvwrEAD6DuXJcma+qX3l7CNCCyT5lKHzo0yzESqhXZtmqkMVEegnwG6cyLfWRUjMiwhZH9y7KCx5pOVNHsnNMomf69If8XOtobuT+19VDpaBFPN+MB4lUFIYfSZ9tJP4RF5QPX4dd4+ZvDeHY5l7wtqLK2bsO2OSaT0A5rBPn+ywF4+MUJDsCcM/VXmFhjlgmhtuRZCvLlIQauWq36v124UNsKT5jdGaMelRoxSP+FGqRRbiCjSiGKFvY0AW/niMd+c1M3Sn8ON8v1lh6menlLpIc37r3oJEbZQJcmlFeKblUkk+9tmt/sI7Vps9FEzwjKtlTv/OVC/23TT8kf9JFtY1DSWKvqJGF1BKFTEzbUuHYLnrXybcvKcRWTFo7Z1k12nvRc76GVR1BCAhRGHPilNQPlCbUXYL6azorgjSjuS9Hjm+iMa7S50X8Y1avmTNUzmqud7qWO3CkLGwQYuVlDSBxHfmCTS4TtBhDQM/qiSIilYAu7VJzjEsNB8KNBAGNbElrnz6iDho86ZQUwNuwf2Zc0roHaJKKnWunLLsEicruid/5uRwLD7btyej3N4GgKoB8CcGU2DYqfCAIK8W6+W+6GwI8RHjf9TQKQikoA0RB+zfbpyzKWL/DihKMuJTqfXY3VO8RlUHDKi+K1sneV4gJ2togOlrr8OyAQmUcdEUdaoCWQZQ58MhYUS4AH1SCqHfX+Nt7UDwFRBvfGWFBWYCx2GMtk+qdDNoYATfKHMPPKRfS74Xn6hQzz/NQPab3N4idDNtw5DXgx/9kN8gvdhJ/0SCwPEeppn93qzA4r5s1lWTYFmo+q9SGtFiQJIg0HPlRkmoRpCFpxc3JlUm+gRMzt49joBP871QeguU5LPTvc4S0B4mpSQtYXKVRh8iWEomaWH+sCjR9jmeP72PM6p1nQB41guKFjrU9PjIz1OrWZOuqmEyHd+F1AGfT/DOhGjQf0qrd6BGE60GoyBhVZ16p+nHzpDsLm5EPf2rY/0t6EixaOu9eNgMpGxVFHJHajQsQtIq6YOR1HleBvVKyNzxmCv8uRLlbrt0UQM1CqC9eYBvgFBPqauaAzXvWEFak3WilRvX0pVjT6xclQuaB9+yG+FdC8evCstbbe5GMkT8KfzQFNdmHXNgcga32y/V/KuGKjReS1Vk4QdFOv+l01BNCfY4kirmrlj1UNWa2fTyQE3/nx7jPeodZZWN2grl73b0eTv9pMX0OjiBF+4K/Qmry0EgS7LxyTejSlY+9d3uMKEzIN8ra1yHbc+GBzqmFI54GVDuGDNsiShpJTDOXAsVzHx0DqZvYA X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ae794b2-1ebd-4cfb-2411-08d981a91680 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:27.8787 (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: jyVG4aZC5pDllXMw3DFNfQPCBrYIIgGAt1P9unDFZyywedDeSrKix/9BSW3r7LleVum0t2dp0p8WavCLemKzGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/mvgbe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index ce5b8eed64b4..954bf86121a4 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -883,7 +883,7 @@ int mvgbe_initialize(struct bd_info *bis) struct mii_dev *mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = smi_reg_read; mdiodev->write = smi_reg_write; From patchwork Mon Sep 27 11:21:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533287 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=KsGsYvrE; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0jW3fnYz9tk7 for ; Mon, 27 Sep 2021 21:27:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 714C583674; Mon, 27 Sep 2021 13:26:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="KsGsYvrE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AAD4A835FB; Mon, 27 Sep 2021 13:23:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0609.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::609]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5564883620 for ; Mon, 27 Sep 2021 13:22:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kq9A8M3wzy1y/ah0rAqvyI5k4geR+WivD7iP6SYyk0wPynGeXnSiqtyyJke5la95gQqPZIN0cSFv3HrjppzFQUTQm6RB7wc/GWWwweJYsARq6G4nPO+hezQC9GcNPU5f7HghcmtJ7tAiXuWPDthRZKWf4kttJPPtQ2shkOuDlWcbEneYhZU7qgpwMLqlok5ZOrWpEhtuuqv4jJdbL28b9vyuYGvqusbIpVt+PMY6BH0LI5gVGL1tE8m9qab4vXEn5d66HSDt0LfKMGSkTnfUqbXS2EIklFGZcVBwF69jtI2NhQrOqyM2UhrYXsnPC61moaMrdvD/DUwXLhnLBnaWWA== 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; bh=WXC4BZqeKKVsYVrhdig0Dfk+QM/QsZvcKL/Du5VKGZM=; b=FA8wnFOCFnspjlBfTMIXspcl/2uKftY71Es5r/olrdsVUhVWYeGHHOH30e1b9L247Dz0ojKS54WFIM/qD+OyodRSGZYWI8G2X5GX8fQGKFcmo4Mxia1/33SymeFbHPUCmlYkjSLqaEpIhwwUxD4YLsAsGDBoyEqcQui8Sf5CmSrtd50oq325mEx3rMoobSDZ80T4eQy9hrOzallos4ZTsZ7XUYX3UA7BQuF6Zlt4CYM7+VNjHHaU5lQpda8fwUCRFknO9eNtWwNSAhEwOPnEorDsfO07r2fiGnGq9QgjDyOQmZ/VZ396dUF0/dHZdJPwqG9mmPaH5OOsQ7LRWTKQyg== 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=WXC4BZqeKKVsYVrhdig0Dfk+QM/QsZvcKL/Du5VKGZM=; b=KsGsYvrEzrtI2b1wmW+7UzUttRaESSo8pKtlXUDBoBA9mRHk7IsHomBagLDMKKtzrWRaDZBvKiWc/uOKpCf7BWQ2QQ/bIx/c/f8KIWZkIvChvB9RO1Eihd6Z/UyWwPIzLn6CxTmX1kmSPmHq7kD0txsiTvB7xJu8htxOq9aJiH8= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:28 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:28 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 16/25] net: sh_eth: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:56 +0300 Message-Id: <20210927112205.301876-17-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e385d75f-3bee-4cd8-4efc-08d981a91701 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GH+LH8OvhlaXVrYyiYI0GNnplVV7NdTpGE4L1B1AffzAvPifnzfv/sLYB6cnSSpr+tzpbR1pajikVfMUTr/hYcC2Q2nvXsb75V90uNLdQNOHcePJAZfuc/dlZDIgwoUaifoOfn0FuMtomVjYPsdTYWCZxyAx2QgPvt0IhNGAmePM4oJYIDFbWkKHt8S16RkISSed2nBSiCAOIFPoY1qb65yh/rApldUFuT06tBfQvpPY1wSGdbwdzbF2MULpuMJQN/IwcHoxSf9z1hnIwzrAVn0cAZjB/hm+x58A5QNv3+YeZun4ACbuF7tI6pBhAYUs781EMEyyd5uL7uueH0JOr1hY1I6dtjpyuykGKp2uJuh2IQ384szaNxXj/AMHNms9/b51jn9BdemFVkc01PVQcNJhC3EuS/8OEyMtpZkJ4JUGGNqat6B1zv6lweYniRN8jg5qUIpAzWL+N4fVg/7JT3zWkE//kgjFT7w8O1bHAtolz4uem8YN4QiM4FhhskqnfOq29PzQepfNxErA7gn1AJQ50j/NFj9owZZ0TBh8Ns1S5s1cwjPrMQFj4rfK7ywMAuUPrtXpIyjPgb+160wo/tMQ1OMMZiGXFkal+1hyc2OLQLT8crEYA/slN7kI0zOiqQ9qOGjkjDaUD7ZLj8EkiZfLrSy6VUk6xSqI9kUFCeZKM4K9vruE0Wuxei71KXey0fknRNe3oRpJzCLhVNVnMA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nVL3yCdIo+jUFBOTlCYeBIKnc3ifJRaXbSZ8YlJZYyBNgFegcw/zKXhlxpaSzynukGw0A/THbTGDT42g8k9aICzF/d655ah+9Ckf3zAo0JFWLRoosgcYke2apn4Wwb8WlRfRu3djCzhnDv5YO8GHLfM+W54V6DXUwXd0bM+dUhfnxaxC6UNlcylc+ABKMzFmxhbt7SGZKCqEGy46fqH5MkAKXGbHP3zPRUvZoRoQXN3ztQCWgyPV/yZeYL0U1oVhBz84bMzkdDCed+6k8DPyZJ/93Ohp88FA1xNU8Sh/Kq7/iSVDLoP80hdUqbII7lgik3oiveH3ocZm4WvEF4BTA6zMap4adQ9SzT7ivPLHwrOd/tBb/FkJ9noNZNInAm2gALjLqM60OOBa4+ucZkPNxO8ql0GXbOHC779bDuNkGnIJ4VYumDwmyiMY7Kc4zMbbZeQcXfbloEMv/G9lTmo3eLnEs5dqzVxSbmJKSB6crsJQPM4ly8VnUVoZwA2GYW9IjDhcD4U7qOIIYnwdNkzG3YnvblzG74BdLDJcMlcKTvNgvOlHrCAHKUAlVqVmXZ4w8xP0VZXl3x+WWFmEDHTXhx3HnoLKlE+Q89iQrqRbdo4m/hJqTUSqShBAuM9GWRrv1cefCdlrmAX4VaN/LjUHEs5IV+lrwWMyjpw5k//vNcQqR3n+Cp1Rb3dZ3clG8YLwfQsfOFS6lzR5/mEYuNnyx5PCC8et2KP/D6njuqElV08MAq7LTY3KPCxpXABBon1ui45b5zREz30Rie19UWJuo3HFOb8mJJmQQOBoD0SWom0FAn7P3mDD9+thdXuZXYcM0Sb4QJFxOdOsh3++ahEQIXf+I05xg6w6g2dEVCwN7IOWKOEoULKK2cmrBgxtuLg+GUEq2HEJcEln6yxWS4X3Va8z0dk9bWvUSuBIZXhlMj71+ZPoYbo7RHgb2mXr6gcFMwap7PfRwWhT3/MEET1UdZmrD+3kF2+K5VuvGxEweObymclg9lprrmYRLypAohSG8/f9IGVvdzZ6U5pERNbpQLPCjXxo3ALl9gA5dxMTwO3HcFcuheZQUdutR5DkzoPNhe+PB4eNraueovHDgfWNnaABcM6nF8/HG4oz/lsoMDPjsGlmbzrS3+vS+YhMUaf8AF1w/AgGasrdFGJYtR6YGYAjzZoOZsXxCuaTo6puisipCkpDcGTlPE4aOyoixq0xw1oweCkp36h2LIkYMEBva/cbEYXdAC/EsdFIN8uZBgZEPhqLmpN44pK0Z6LcdseAFbUNVmbl6+2Krm5+3gIkp3A7dUnQp0f2o/E/EwJydUDUC6zZSGatnxO5yJP4/Ocs X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e385d75f-3bee-4cd8-4efc-08d981a91701 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:28.7232 (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: 5GEOGu5auDkC83sDtxunS0kfuJRDvqE/yQ2eMBiKDZs/dvPbT2ywrnQk7mATDQTYKzrT+7xX8wMn4I3ClT+4fQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/sh_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 3143a5813a6d..4055f07b2feb 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -657,7 +657,7 @@ int sh_eth_initialize(struct bd_info *bd) mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = bb_miiphy_read; mdiodev->write = bb_miiphy_write; From patchwork Mon Sep 27 11:21:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533278 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=G2cNNKyn; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0gG5xv7z9tk7 for ; Mon, 27 Sep 2021 21:25:30 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CA53A8364F; Mon, 27 Sep 2021 13:24:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="G2cNNKyn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 389A48361B; Mon, 27 Sep 2021 13:23:07 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::61e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 77B0983622 for ; Mon, 27 Sep 2021 13:22:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YZP3r9HHHxm/aK+Lew5PdX77WsS3EE9OWNZtBg2LH+e//L3B/K5QmzgieXGkoTa6Rap/7y5qADj01kwb+dq/g3eLHUHlMuGJ2fZ+WOnrI4eT+nT1iaFyNvoZGUj/ZniRlfaiU0K7z3KmK9gpdsMHOIVpIvPOWK7hGOJbLoiyLwr9xo4vlf22e8PKwEjwEG7nsmtHbNwqD/UHpEUng5I0QZGaoshoIR6arzTorJEWqb5QjUodJatuIu1bKDM/lQEUyNchfUM4FqjA3RccTkqyEl2HWL90a34mfXt/am0sziEM1Ieb/lIxLeQDgkZRPOTBoaJp+uHn7TBCqJWcz53x/A== 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; bh=geISJdTja18WX/ygNbrWFiPLN5N+oN98VvQSF+fBX7g=; b=JzCybVqWHvmDCVWIIOhhdpVxFWNyCES6R/vPx328HBsQ9Nd2Wv36Ib0wMWnMIyj0689k483l8owRwvtsn3N6rHN2CdUgAy4qPH/DSQtfqZetz2pPJkYSY+v6ktFCBhDIkuP6qClImVGQXANNOCX+rYvpdgxW1s4btWCEYLcSBmryenSrx/SknEBxjNJd2NKJ8haZH2D0HA6fZUCIC9O+tyWF2u7wfMPgFgeTbt2GiAZ+NMEG6HqcjqXHrPUiqlwXH9i48OtBurKpGaZQ31TLaRMJdWqe20uvQBcZWXDlSw1RoCe54lpwVpAnXxnkWudSGjoH3fxiseKyPgBSRaIhlw== 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=geISJdTja18WX/ygNbrWFiPLN5N+oN98VvQSF+fBX7g=; b=G2cNNKyn2VgwGMCPcBEQjOShjNU432smdl1KI/kWKIZNhIovYJDz/FELaEs/UZdX69So3ml4V7ONE5RM2dQqFYVJYZLRXz3KcK3p8cBkKi2E3yCJNqjYpSO6BOOdNqyhKiCvPDG5Xc3tstvqcRrGQzhjEec/lQdXR6jLws4ylLU= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:29 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:29 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 17/25] net: smc911x: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:57 +0300 Message-Id: <20210927112205.301876-18-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 69dc3266-8bd2-4c24-604f-08d981a9177c X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Ul+n6jBEuxLay+P7IwJamYeIFTcE2tcqGkyJtqFNKW4kqARRgNA9OMs6/5yJU/BLDOY9iCrzsJSuYXZuogAdWJcI3J2gHdK8CMoE90kAP41sB7OoMdHLQ3hhtBUknzNyenhuHuAOwo3xrRFQYqCrHm2Lj2GwcCS/hznm83fsqHdsaJGMY9QvLu/Lnz0dwMgpUY31lty7l9R1a3MqeEV4tcKMzb0uPrFgbx/IxbuSbh2OrYDcIxAgX+OEo73tQcS8EluZO2CZ3KX07bzRYIMDO9a7OA/MvWDiNVUwsSzUx6QnTG5fL1t5/5mxBg18iOhKuCSzD9Rn2G9EtZd4fmTiaPFMvtxP2ITDRNIsRO/vWi/C5UfVBGz9FeKWAugw7jotura76VCuKRXSzX1WKVFyIrj7fZTkkZfoPQjjAqqOuiPcEh5RppV9Vp6pT/OShfuHk3e8Hh6Ucm5P6QCUUpj11eDl1fGe4ksVaS8amzWSKzz3OhJOipzzeFNtReVXEvHFMk21Kow/H7EgKTrsCH2yJeSVc5LUDKGWsIY5GGNAcdMNWDiu8yL6yQTxIsgNTPctoLSUQfBf1x2pUX/on5DUXzP1Yy3KnujhZZ1sxktoMvxk19rMr0Z72Nl/sE04gWdc9XI5H/qay1qYDvkr/rZ5rjz54AK0nHj+UQiypFYpbJ3wF/e/f12kNnhyKpjXdEAj207q0ybCRBqdmryHU5sHA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hoeGLSsTLtx+W6W6XGz7u/ylNSlsyXbp8+HOsmX8oC836boUsTun0H5JC2LMVQ6zk8RQTAdBiM3BpvMt+Dyn3O3Q98erG8toTf2llSYZswOEyzEdDUzu1wR01L3YWWTMlvRDMcqUYrTpdLuiJJn1XvXg373Lj/8jttBjSeB5b94BtOTPfvXWNONMcBcGQwdhGB95fk3q/yc0B9CGQ7gEKNtzmO+eUn4Ewgj9xVJ8J4b1ElzFW4nkMDjNZZxIIm/unIKLNTDv1CjGsVZ4Lw+/PF/WA8Va21GqjPai2GOa6kKqlgS1eRWCLPDGXXLblDER6Idy7i08PgCR3uLrpVlpt6yM1aVW05cBd9YZVrWTxO3UpAFveucYE5Q25pFxLLgfmSpP95v5pGfPjf7/jTpNep4Rn82ZLVsLtUmIg+6E8rU7ngT/NdS0689SICoQE7O3cWNqJQMLjXYiXBjCTLPPy08+KUvAAQQqYZWmHO47Fqgjqyb6YTpRhLU22mJWhQuGnWeB8FtkGLCREPtB95nuDRuWR5g7dmkwc61m6EnK5ewunlLams5PcucAIMVlUiG6Srxm94skiUeNOo1UBQklhdtkTtgRDqD3JAFgc6WSr1c6rldrUs9/xEGbZJZHbemdX7Rt5LhUSd+LhnR1pg45+suMxmde7gx7wDdi6yRtfBTohh6Z5uBWbcRVp7jxSgRFV8vHPhIh8ZHpz+baisXMQ8j6sT6r0EuGbiFgmIUSay7wgDzodMZi2fJO/XEsYaLSdlHkxkM69P64GlJeEGfjti5KEyomRDvssP4zZhRvf4ETq1jf4oocUGMV1DY+DbcRA1O6G+vNXhWGJ+/uV/va1jOJ7vhPaG5Pfix3uKj0/ukuualZw1iX/UFpRp0g9NSm2iynJs6Veb5gpvYUaYw1hqAB1xzWao3DnbzOy+TXRIH9Zak4K1wRloCldIxiWerl7Y9J4LTSrXxNg/VtpZuXXt4dIAFhB5mpU8pg3YyyRN3BHUhQ59ZZcT3zZJY8InHopPPn1suIIp7aqG10btgWJRZXVZHngeRaKYY3aNdSg5qi+/90BxOFfDypFxvaC/mGE2fPXl4GRvN1haHtXoetnWMC28j00jMb4RlS6AMGlxqLqFMXTYFPdcatcwh7xkJhO4SUdJhYvd1YHImOn7Utaul2nYZ//x/m2fsQlO6YuaZreIZ1Zp8+/z6f7Q3CHH6KV5PqvoVEQ83ssC94Gw5wXLzMHiKcOQtJRvVF8A0p8A05ZepXyRDhI2peo3DYo4mlq086Uuf0FXg8KdRhiN9sZzZJMJTfh6yTbri0lF8PXM5tR0b760VeigehS5Cb/M21 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69dc3266-8bd2-4c24-604f-08d981a9177c X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:29.5347 (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: ABFlPEcyC4DeLu6DQK8JpXOWDpBjx8UPBfijMwQKJawrMN9lA/9WMQlxWLwqvrw86wNOVO9TtCz+BXqtUuigxw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/smc911x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 8f420261fa8d..5d9a73f23d75 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -425,7 +425,7 @@ static int smc911x_initialize_mii(struct smc911x_priv *priv) if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, priv->dev.name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, priv->dev.name, MDIO_NAME_LEN); mdiodev->read = smc911x_miiphy_read; mdiodev->write = smc911x_miiphy_write; From patchwork Mon Sep 27 11:21:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533293 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=bULVI2hb; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0ln6YbMz9t6g for ; Mon, 27 Sep 2021 21:29:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 19E4283639; Mon, 27 Sep 2021 13:29:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="bULVI2hb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6521E83606; Mon, 27 Sep 2021 13:23:10 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0629.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::629]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 63F8D83625 for ; Mon, 27 Sep 2021 13:22:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FoKK2McR5xIhot/LBhKYFQHSEhGLB9ewXak7Wswl7g/eg+spxeAolYiecrV9nBDtwuQIaDu6lTL6CavVKSj8NPRTgiz2koBW1lM8oMRHBguYkR1RbeAAol/es8Vn2hXt/IpdlG3zL475cT4GfOxvSS/YEfBhWc3ZDJS6PrXRNam4ot/IjxYv3V3FZzzvQgabWgj1Qr8VGMMStzyTkgAaB7N8rfn+Bbg+XWEXg3i6Xkmk9GiDgH1w3t/Xv9k7PM3X5n5O6ZB4ofWFo8reKcYVs6clo9hj8kx9+4nyl9eIe5UKDiVnMO3bh6Uph2s+duuxwn6jxVWj2ACWU66RNwSnaA== 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; bh=RxP5asp38yhalp9bdAp4ORizNwl7G7fmoBY/Gw2+i1Y=; b=ZxkMHNYyUZEZVq3+sz0KhG9/jB257d9oKmnysVSr/yIk8nUTn6XulGvBsqUtnQyzartFRDLUMUCD+jXYoQnEkCdLSqnawGiVa8geXhO9pIQjXdEGJjMj/TVAKniVFOOrwOyPwnSFZky8izk8ciKeNsRjbAp4v+tMzMrlT7e2i8dhJDpZDlMN2Iy9QK63KLq6ai1ool3GJRtmWaV6AORwxpGXS9xNcRklflHkgwQ0PIL+dBwgnuvYSliYcdtoeZFOjJkiFHMmD/1fXn5KfA8bLBCvtpTE0I7vrZhaKVmGtbsBkZim1B95ccAj93df+qeUfXIoJ85a9obOcXTPG6Ba1g== 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=RxP5asp38yhalp9bdAp4ORizNwl7G7fmoBY/Gw2+i1Y=; b=bULVI2hblqA5FcpIKKp2ZXDDzBFG6WUXosvsKiuh8VlyB1txgX2dVK+8yWkWKSDFD1XmDXj0PeEdopAJkbViQXldxnpmazbt/LZDiDhD+z6QtHypCoupjnAI4uDnpL4sr36fvgYEE5upz+XWNXPcA/QaS6YwIxbA81MvIwnwm8A= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:30 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:30 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 18/25] net: davinci_emac: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:58 +0300 Message-Id: <20210927112205.301876-19-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0875d016-6bc4-4931-00fc-08d981a917f5 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +s63S5BA0yUSFBhc9ryv5KmJXwypz9tsyif4KEhpKQXF8GxohUr9gCSJ4Ekn3hEk1LGVdyT+g8svTSq7CdzHBWkeGpaw65pw5oSa8o3LqkJqxzYO2Wc6jbTQfM0SrKi/8rEv1LcMESRqakWDNzvlIef+WdIdyQxBeZqyrsgWCbogh7gTxVqMcsRy6884lS+fKYG0HVVI/AgSxvzQcuQKLVRFlOrh8VLdTz01N2ohb8D4ZACKjsXJdfW+c2R09bO1YJf1JOahGBSE4cZUFY/0SlRctLFBNwr49QsZcWf95UGgYRByOXeW5IAbEagrtLyvr54b5/Pu7srqwfTVXx2YzlFkmW0sRGWhnYxSrzd6X7Ex6F+9azrLIfX7TVHnO/zhlP8KtcaKO958gYBcbS+cRUEkUELzG6HOI88SnmU1GuUr2VoTHdKDAS0jmiZyZbHthNnZ3o/e/6lTY4Gmj6gio8+aIdI+N25oNCfLfFbsvhZ7ofXoMo1lxo5siJw9sBFCMB+YV8+HwNC9n7S7VAROVgaSB2iEBBia4pkZkk0V/DQEMaoaxdXnJ2ZeX2BOWVdIxrCc8K6mzU4zogc7IRsx7W83klKuSOi7+Fdr8Y/vrxnqxRF69ZoKmc8b3Xj2yd6zmicTrngWAhrhZRt5m1/rJsXfU62TuCMFUsZLBGlVAGPfR4sjuuF2a1j5YKZOI7hsoRG7jyh6f0rWzTkMlJcIKw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Wb/PLi9dxwKvvvcjy2BdX9TTppfrTJXz/YpW+k8tNNoj9i7O7+YSauTls4xcNEyW++DTzj5yCpueQRZ1eu97A+SPk1/+21T9Q9lIQo8FuD5QE3v7QoKuCn3Gr/Ck6ltCApVqvcNVinv7TA2+o9hhqfHG+HCAa/ZgDgXH0IaDWnbJQJTjbGsyX9nn6GK8Ul9SbuMFi7X5ITDI4UlnxZQ0wfaAubPUDVnuKx2N1oN5nZilbyaNUCqiAd/7iAD6BF0WZp1xymYqkUOGvk/lme2TVcdy2xbbzAQ2THMtYmegB/TPjqdceuJSsbFJfB30Eel2MXG5CTGp8HfDA2kRAhcyY+i/K01YmbTGy1UCHuoIr/uDA3pY9KFQGzGkgiZckTAWqvnsJJ/zR85qsVggWH3D+syNg5IIJj0kYTL/gs+ROKbJtrXq9QIQ4vFxgMX9scUr9+DzNTDJOwg6CMJIVFkuGrUId0QdN9CkjxTGOjLoveUbP7L64JiCf4R+/ke6m+pQXHvPuw8tECY+KFAvwnblFF6lEdm6KvaY8fVgSyQ8ES6DQbBMY1U4W6rZbRTVkH42xdz5j/uhsJpYH4wyjZEez1MXHheRH9TvjIvsOD3WZOFqHbaHPlv4pNaRTlXtevP5jQQHujzkPJ9PbGr91XiJelngTKo1Pi1k420F8/VKcL90LVd8/8PXK5KNsp+sWxbhEI7gNWDvPuA2hHi3o+cn4cy//mtkWs2wziDKAEBRZBiS423pFqAMFVBPUKnXOUfMpaPddfTNq7jE7EmBf7giLrc2aDdVBWBn3o+ER3gjkCGLiKoe7IbXUhGdTdiC+CQ9EIsS44iSS7YQtT0dFlePBuCCG7Dx+mD8UifR5azlhR3hVs0hb/i9J/h5SSHX/AnNCTqjby28OrWM9uKRwfmyiqW6pFL/m0u/DS/rIgToVPItEhj46+DZLQPy/pDQcooCSgGBAf/B5DqV5cTzVpfzE6hiDBIhQs2DiFKp+zjF7y0Ho/LowSDwr7K3+k3vQIBXxEeYowfDOtsriT2Imud8IiGQaHp2tpAmDN0fjnWYC9XXP56NqHlE7W2rokK5BmVO3JFjtcGdkMewvMwWcOJSrkZrPdK0QWpioxi6EZvDewodTZIf3p/qdPWJtRvweVgU9KgB9vZP/jsYB0bqhf3JCQMEL3kQA5AjyVRRnzaETMCXzjGQ/vFIFqIb5QYlA3Wczd0wLVGUMMAz/up8gAU21nXdXkrcpGdo4BehJPjNwDiH92utn/7Jgi6Sl+T+aEFXKWerJmsmTjOUMYZugnNX7JrGXVChw/a8z4az0MhatSc8dI5QL0n7QfW2Q6B/xRJS X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0875d016-6bc4-4931-00fc-08d981a917f5 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:30.2843 (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: gmcpFXz/mwzZTQsOWRRB1PKsLwqAvVefZfL065FWo+R0BiWQwOnqvgHKLKQu4/QyxZ9VkLKDTse/RYC9aSi2gw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/ti/davinci_emac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c index bfe1b84cd566..2dfadbd82d5b 100644 --- a/drivers/net/ti/davinci_emac.c +++ b/drivers/net/ti/davinci_emac.c @@ -816,7 +816,7 @@ static int davinci_emac_probe(struct udevice *dev) struct mii_dev *mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, phy[i].name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, phy[i].name, MDIO_NAME_LEN); mdiodev->read = davinci_mii_phy_read; mdiodev->write = davinci_mii_phy_write; From patchwork Mon Sep 27 11:21:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533281 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=LQ40o1uc; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0hD6xLxz9tkM for ; Mon, 27 Sep 2021 21:26:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E58FA8363C; Mon, 27 Sep 2021 13:26:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="LQ40o1uc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 97719835F3; Mon, 27 Sep 2021 13:23:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on061b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::61b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 20AF783626 for ; Mon, 27 Sep 2021 13:22:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NfCsLX2u5Fu90tffLnkKe2YZHq7NT3GtGIGFhk5l0/XsFph1dcHMHcrWUAcy0x/fGZBeL05Bmabvlrp9FKutBOUN+4JCuYk7sLMrmPjArNHFcKqTiw9gfvlwvGQ9Nu1AG+AFXM4ZfDVnUcckEhOrZZXs0/QM1wmduzB+LwLPO5ralf8+uBFOMLDINUYbiQTGcEhh6zJFR1w07g82XQ6/kXe+mRQHRgWUV/m4R6P+CIjnxeaLz0bPmNpuv1cMAu6CeKRnfDXGMNiPYEsGz85DUwPmxUVYGiZnHmNObWdw1nczER9hwtLtqE3ZdloW+hXYhb81GtOrZzcmpBcixWZL+A== 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; bh=y2ayc/VR3qNx9dq/03UI4uaDgPTJUSmE6foa9siRFbA=; b=VeT+CXF8ym3ni6bVVydbljkiLju9sxBNAmMvQVOGUgP9rvhhFJg7sShoJ8K6gccqIbP9sjcIMxu9L3Oy2XyEkfEJ0sZI29q7POi9bteaFQls2Fs3iSeQHUHCfDZeOE4bWL1+1rRpUQvy6RQUwz3wB3UQVttXL5Wu9Pm64lL2HQMohpmPNogKqqjz3PE4A1V9O4CXAvs0nXZ/lf8kvbydHzMKyLeqR7Stids4xV9/g+EKd3fysvj2FBgumXfxPfS36skCE9QaIqzZrIn6wuh+Bl8S59TWA+zmIEE+zrq0WoL17vUw9IeAxiGmYd6yNjvYs5z8BKjFyjseLllHupNCPw== 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=y2ayc/VR3qNx9dq/03UI4uaDgPTJUSmE6foa9siRFbA=; b=LQ40o1uc0hHLGNhIlzuoPBqxHS8HBu29vijHZTnww1nbJYkyNPqXl0TY2a0AVN3yf1sRb0kh1DAc7DFiyWKoIf6O5TMYkbnxu7Xh7zKwMAKqplDm7WoIm5hLSY3I7A2VwNDu1S057i2NnKFsd7WIi1zQYVKoD0B0KTC1mnAqaHc= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:31 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:31 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 19/25] net: qe: uec: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Date: Mon, 27 Sep 2021 14:21:59 +0300 Message-Id: <20210927112205.301876-20-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2629cf48-4b96-4431-5390-08d981a9186d X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bqhW1YWQ5nvwqnHbbVo0YJjg5AVEJF2bK1XKWtq5Dt4u820IUIw3mr8IrHf5dCMo9THz5L7gJkMmzLVGnjWn9fmFdxEHttfS+VuMEWw0gAewRHLyKeuxBOaPKEyRVfNpwYiliguY22rIi01J7zuHQb6DocAt8JRqLiaz4C76ldFf4XilNj7teB3nHE/9mC1oj6Kfts5eZEayqq0D+pce63FJVAcK4KyQiXanvbqC7XRi2I/Jdo0Xorb1TSNLB0gYnL1VH5skPcMUwwhDR0ND8U7tgmUbm063fa1bAx2OnUuc2e7Wa1qwfYQMfmqeHJOs/3WsFFqGkcopuMo+bUXq0D7LnVXlW4qJXxHK9VA1K55nj0SrRjFBaBFzkugIloakcOtJupz0xQ47RcKbyzfog2lDOy1/z6W2iizwhTVTfN391OwcW/91JM/orYd2BP+TQPBzMAs1X4+EM4/rHPcZjvPXCH0kFJT5/AGrjljE0TfA8K+EA2Z19wuVhCgkTYsMY8Icznk8Ei1MvmfxcT++prkoul7FY/PaWDGM01PWxYdtHX4YkAz3adhucNcHQ2iKHrvVjA0ydLR5F9gHtf0iaZ3V5LRgo1yP6yTHWketUXZ+CFXzvwGsOxOTMVAZfBt3AgOb5M6Ty8HAzc1E+J5KiVxcyIuqBDpC2qzGdmLA4uxEa2uhKNawSQxX/2wSB6j4CTyooyCkQwi6dyNlXZbMfg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gU3qcgxMFngMWABLCD4VQpQ+ROdHkxmDajO9yUErqXr96eeR2zrxiDBQnxXSQ3Iscd4R42myjPJ/aGREC3n8w5fTYinKr/Ab56mHEUkxGHz8nUMscFYiTiisbWgkl+gtX9TQswvlW1TGMFUOH6clzF1V8totaDafCc9fzOsnrL5kEFo9jTaHcDqru/keR0rfzEqa9WNTSsHI2IfjvuiI3ZYTIuTVuC/ghjcTbBzPrV1lOiK51AGyjZ8pMgK0/XrBC7p2im8szdKRRgD9QuRgBeTR1kV4Ea6PQdgrUvqQyS+66JuNiO8BXELi5CITyT+kiTnAZUbSYazHH7bJMrlrbXz+dmCxEVHKmw2nMwaQ1CJV/5f7dBgmYB6Q/COaz5SKefa7k4q9NATlggnDxxjkXrf0ado+tUw+F28euJgdEmbtmm4WD0yLYrqASdsU1WpsTBzbW1ZRxHoQ9NoQUAO7+mnJF5Ti3OqyjIzr+NSqs+d/RkLh2raonARDbNO6qn48u1tl2zNPNY+wmcfjNu6PGb+VwG91oi3tGs5v6D4w9/JZZa6UpTTPzLMnK3ilj8ZKbY4wb8HutuDpf25azYunhI/s1Cbu8+R6NFVF4SMFVR07qhT1clhjibOoQejv/RWfpQDBl7LvWiy2zO7wLACCa33yeGZwcrEr42GCsNnFvWboQLcsRYkVS4QIx7D3F1K3qDN6U2HOukjDtofCJIfErjrkSMKZpG88x/w3igDnzSw4XzwdWTakCuMUAZdpTGnEaVWzWZnzpMdr710RYxLqWy3+pgSEGhVCG4BIQ7VEfvBJH2TO/JuxE71B3sfXlWWxlrUMeNPrLSY4+KO4lUBzHV6YrNI+y/NfhPBayn96qtC/LcEQVFv3CtRm91N/JSPkBGCjo37zgnH+nCu+suVu1j35oxWas/tCXnAC9GtA8QmlasKVTxm0mAdxcR7GlP0qb2I1kk5+VEScKyDX2PId5uYQtUFpZusPnSOC8vyZajlK2+GFb+D7mp94kmEl4GpSUCLPgv44FmLJq8ofLGguhQHJ5DlTYaBPaolkvArCLYjxk+rE3uVTOdGxDdDYJaSadYJN1PGR4F+5QtryAaXosazlhr531kvmm+4o80RS1Fl1TuMZRb5ucDCXczegl790+vtJr97lNymPFf7/Ve0obujPJjuAGdxc2GHe5/EC547j9SP1ogrjaa9xfMxFQ/hQ8RCg4+q9oRLc/EVyF4DKy0oyIajxIESIOoWzi72+Id4iFZYRnrZQ+Y+B17h80ult8x/zZdrKfhLIoBbUPKUleXLUdBiSnmlzYHeqVovgSwFgh6J1ycErL8LhbWF83x07 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2629cf48-4b96-4431-5390-08d981a9186d X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:31.0978 (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: 36Q8BdwBvByNLfXVXZXisSQwErspD2Ix3LCnRLbHH7If5z6oOJeO8em/qiiBPbEdkOYwlpSQzBBA4C6Jqgrm2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/qe/uec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c index 5da971ddc0af..c4bd5c4a147f 100644 --- a/drivers/qe/uec.c +++ b/drivers/qe/uec.c @@ -1407,7 +1407,7 @@ int uec_initialize(struct bd_info *bis, struct uec_inf *uec_info) if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = uec_miiphy_read; mdiodev->write = uec_miiphy_write; From patchwork Mon Sep 27 11:22:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533288 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=qx24vn1n; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0jm2Ftrz9tk7 for ; Mon, 27 Sep 2021 21:27:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CC69F83676; Mon, 27 Sep 2021 13:27:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="qx24vn1n"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C9A1835B6; Mon, 27 Sep 2021 13:23:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on061b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::61b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6CBCD83627 for ; Mon, 27 Sep 2021 13:22:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LoBkDQOw/dbP5qZ93ouio1fEoqV5otkGg9ChFEvVEUA3B9rMx4RWnH0cQ/qM2n4ftU0IP0NshWSpYmcMb4X2vRu/fPxcjumzQO/p+NcoK1oIbxLgrbO5b4Pf12qiIi9aki94qgbXYNQdKurW+sLIMgt7EJaUtsawYl3Of3TyQXCx99X/QUBCab3uERLrM3JLnP4i5cPJK1/kqmfqgwqZbPG0+LwoPhRzWvAhimJdanKt86J5NlKcHrQLXAa7Lpt/P5mJGik46u5InaWbPV5qSwTw2AnEQJzh5JqAeMGzMopLNxbZdHOLyBH1pQA4gE7lfvPfrrfblxiQhyVF7bHdkQ== 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; bh=wMCXjz7846Fyf61daBsihT7aBAuJy8XAryv/TZASuRw=; b=Jw7zyW/vx4kmhAMpR3nzAPhEMYZtfwaNfTA3PCZpCjtQyYZs7ZbHx29Y/z1OEyFEKIOampjuCJmjc1lPKhmZEq43KTMcM5ziQmuMVnV7et+pq5drha57S4vZQCQSXedUjCKCFY1RlIUIQSFz7W2t4p1nPU/xaEW+FuLCNCZm4V0LJz5OyhOL3r2ROKy3aNNaqZrPA6khYGiam+vjsk4Y9UzWjkGaKHxrqg1OxE1ppUQ4R01ayv+KoI0Bzonx88qhJSvAyTwvnnVvHDLELb0XeLeR+poaQssEyDHrYXqdqw6rq+RJQRrrJno3I6ssyIlX1TWS4DHkl/ImG7qE1icsRg== 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=wMCXjz7846Fyf61daBsihT7aBAuJy8XAryv/TZASuRw=; b=qx24vn1nRy66VVBpZAwuYCIhcdjWiSpBjFlv9GZPlMmVfubwArBD9lZG5haPXcS6mi3HnElVLwjIyWePbdoV64HEpDJex+NuM1Cv0y6t7zdppxZWH/mb4vnRa1hHTnPmYDGyxEZwRc5MUi7/1U1qSQgrPoJXaWWyBNoMdNyB8Uk= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:31 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:31 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 20/25] net: mdio-uclass: rewrite dm_mdio_post_probe using strlcpy Date: Mon, 27 Sep 2021 14:22:00 +0300 Message-Id: <20210927112205.301876-21-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 26954e48-d3eb-4841-86cf-08d981a918f3 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:409; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +aJLrNDkpJ2h3WemFiaaD2v6BAzy9O3OP36R22wsTaLMdWQzyGSJNH2+0ppzzBkxpn9J++rdbJ3k32kKi0CYQWUkOSVYP9I6N20Fz6qyES5TgAy5wvHuL4qZCvOQ66o492vmL5lvwDlT8WUv7G6x8wa1wCkTBl9cjQD4Q/TmmCClyKOGPFECK2nPgo1uWzlRnqpEXLhAn5PnsUYdGLE97ICLzYxS1TczNkAGP+RjDnEN1lQdNz0kvL/GgpmoCNPN4leCIncOaHBWC+0k47nwCOUfwNIR6eKNMqzsVS8D1w5E3CNl4qyQMWDZW728ZsrBXLAd02lHA1Q8uc5wq4fbwvwAabPSUSNQE8WIOzLp8SqFSZz7obA+US8oqtM+QLUzPxUr5uqAHiSlwjAr+7+pu+X5TmMURMdPjAh7FTwJLjMvpcW8ZGVqLxAblMjDPzdL3PzUZS+BBVFYDdbmrAeaZ10ECKI4nVsZt2wKPAQMz/9q7YVQkhaU+tceQnGXLUbxtNAUijjvoHrs7TlczfyOThTAwIt91r4UGFvptVml2+9Gx/OvZfDBM+FIjWgyf0CxcB6riZzL4qS3I5qUYG/ZK/fJalTPaGBScy8QBBqDFB28GXPgNlIrvtjodDxwz1Me7HVe25zNQ7EYQoXpyEOecHONP2n/P2E1sGn80hjs9zyo9lnNiFkgz5WGfwY4MbMmTmSBdb5yYP0UVcZbJ7OKhJa9ZWurEd4a/PYjiFIUc0I= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(4744005)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008)(156123004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TpiiKx0JOxCPutfKRnvxCWGrGZ7x3tGvB3J47/083a4ruTKkOhVMOBjxfyDgjE/LdvYWQQBEt5vq+h8Ms2RYLXJ80hpn4de4EFD99wDJ1jWdVamhlvfxKI379XM817JGRuv9xAUICtEK51obDaVwYvzRh8YcAlLqaCwmBEDHY3m3/XNUl2kogn3rceEalz9+GDM+0n1OO+Nkv47gt1O22uHtPxDYY7GkdZDJ+MRFkNHeQWrua3d7UwMbFFIadE7i9LMdGUbd06hN6LZO08WftJZA7w+RQokNabE9GukwG7+R3ylK28wHCOPNC/8kJoMij7rU84O6bE9d5ODIfHQsynspPK8yd7h+oPHx826rafOmir4sIV1lDLj6VWUpMlucEPxF4YsAk2Sq3ew8LrhvB0TcmKI69qzKGh08Bcjk7dE+58zreZ3DvIUYYvNAV8IAXlGCFpwGuwpTQGLKYxbTM2rUBVmctBYyr2ADdIAbnxQ/kNqB/HJPM2rMaBiEEuB8bjJ5q6ZHgUSd50CLzfdVhrz8rDS4Gjm7YjlQbCC1776NLRN5EHPcRfCdKoyM0ONinTNlMq4nNhYEUockGtCksPz6LvHH3kk7wCcAcIs97tXsw/HnG9wPAAQK4e1ixWbDwNpqucUfdjRlkGlHk5TByotwfj3FAqh/NRRMW8jNuuF9KT1H0qGmsewmcRxXTs/s/NcEBJ33/xbt6xIqkwxHiMqZl2yLKauGL2d5mjUvUPzYzfn/GPwTqm4kDlVLSF+HF4Q3y82JaLqI2/aoZ0eesNo9dNQrUfVvYR82Stz9eyUYSukmlytW7qh9yUa4VmuxljKQAyfsrEtHO2FwPjtj64k3F1tfZEo+r4RJblKVx1/c0oVLQK9ncl6n2Peq7Rz/GdZn/SaPEZsyyYRPX1qGhGtUpMeUc0ox+ZMhFP1b1Rrnp56Qgu0zOewF+WBu46fLGq/6S3Bgf+NX1jDt0YKGHfyRvpqb1ond6ag9TPyZoKzbwLkYDbpXUUHrwHlPHiAmY5H2ISFSvzo4t/vuVDPq6NX+T7pfMaL8DQ1H1kSzH1Uz0RApA8XZpArXlxqNt1eD9VmfrnjNRo1NhQdpKd4qJyWqKXLA6bNGcFRhz+ZTlX1to2bQSard+rQ1AGw4GG/ly4ArjuEveie3AvJcFo0l2URWUX3hku3z9wsz4F0XBw+DKUKtlw9VUt02akiVGWov/s+34zG7yf3aVTefLe2YetJvzM+GTl21qUylyx9gabZLKEetHzELLCn4aAF5dfwjGRc2x9PvQFusxf5BYiPeZ9zfly6oLZdxNBplx9rAbhul/dDibgvubK7KiowrtoRA X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26954e48-d3eb-4841-86cf-08d981a918f3 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:31.9144 (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: cwtPGI55edFFnJ2Ejd/3s+ijNrfJxL5PvyFbJJObZZ4GE/Vs+1eAXa0rALS32MwAq/dl3SCxwaAj9wSH0qo2MQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean dm_mdio_post_probe used to be vulnerable after truncation, but has been patched by commit 398e7512d8d7 ("net: Fix Covarity Defect 244093"). Nonetheless, we can use strlcpy like the rest of the code base now, which yields the same result. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- net/mdio-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c index 1b687765b8ca..e74e34f78f9c 100644 --- a/net/mdio-uclass.c +++ b/net/mdio-uclass.c @@ -101,7 +101,7 @@ static int dm_mdio_post_probe(struct udevice *dev) pdata->mii_bus->write = mdio_write; pdata->mii_bus->reset = mdio_reset; pdata->mii_bus->priv = dev; - strncpy(pdata->mii_bus->name, dev->name, MDIO_NAME_LEN - 1); + strlcpy(pdata->mii_bus->name, dev->name, MDIO_NAME_LEN); return mdio_register(pdata->mii_bus); } From patchwork Mon Sep 27 11:22:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533283 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=fMG7mrY0; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0hV31ZCz9tk7 for ; Mon, 27 Sep 2021 21:26:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C91D383654; Mon, 27 Sep 2021 13:26:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="fMG7mrY0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 36D41835F3; Mon, 27 Sep 2021 13:23:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::622]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B2B6F8348D for ; Mon, 27 Sep 2021 13:22:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vc2HordVU9B/GXF2SQejiVok6u+5yITGHAm4s6XesjVhxb152eFvCuWsiZSLFhiuOSoIm4hCOTNONjOzz6nfpx6I9TPxb0cXL8hi/Gik40cJDJjHUwqGtnJRDn9z4aM1zgcyIHIc2nAx4l+bq7PIL1z1U/p65dVAW/6mfYCFrGCVJdOXVdGjDC9L7PCxXbMDi79JORgkMqYM2Q9Tc0LQPBdLz4TToEL0pTKL/iGQglXm7dlGnpkfngA6wPteY+0YvYxaJdivgPTq18uJElQJ20cQZX069j5IiJ1slzztTG2ZWRx3OpMwdoP1ybcIbI1xR4g9tdi5GmoKzP9tDOm+Og== 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; bh=YVl/Rvtv7BxEAVq4JZITw90pJet0xrYQ7yyRyOvUV80=; b=a6YiPBahwKN47rYCH/+hzDPary/VJkM08Cd0u2v/zz91GeuuJv1DAXAOUNLgw+ygALwGwgS/lliF/TU9S1dMtcyjZUAVYDVjWwCePR7+p1GI6NNvaye0aKPuOMnk/d+aBePRazwrGcB4/VaHdDgbPxWCApbn+52n6tTjNd/cKN226Y68fOLVmWXSz7hQW0LMLplAy2ZV9xrLWVSe5iQAzBhLYUNvRdgZPuimBFFNlIpZ0hsjxFV0H8vLwaX0qniqjklN1C2IXsk3tFiqmrhCWJXB5YBGtkQ6XHv8y34J1aoDyxEu0CBVryFFfxvJiXkCH1rqyKDXY/DuN4X4kKG+RQ== 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=YVl/Rvtv7BxEAVq4JZITw90pJet0xrYQ7yyRyOvUV80=; b=fMG7mrY0p5Z6he6n3nT4x4dVLTz29rLWHham9pLaWihZabY1/GmZOS75ib59C62z/4RnRoYySBUUBuTeOux9yCvqOZEjQcycqzBzA8fI15ggYV7guG6guC4Tbv9jmqJihWhZDBettLi0195PfiyakATLhQVh2QlZG/JnAp9a9fM= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:32 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:32 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 21/25] scripts: ensure the cocci script for miiphy_register does not leave NULL-unterminated strings Date: Mon, 27 Sep 2021 14:22:01 +0300 Message-Id: <20210927112205.301876-22-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a7b7bcd5-b74b-4e6a-6de0-08d981a9195e X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qpekfx3SM45yo+x+5LmBMP6Z+OT65jXRsAAlw1ywhKEbuUozt6uVPL0JCs74r19oWQwqwvZ3BDQvnO+wljjfyCuwy6Vz/IoO9pU8Ne4efdv8B618jHrhTLPESwEA819DZsmxv1PGJgO3JeODeavbk8MUjiksdJC8w77lcqJndta7qSjTRuksJW0Pxg0we1RpToJnke7BjrTjHHkjTj4159q3c7cPSZAh7yBSrGA3C7BjbxO2QZwZOPQ/hVqOnpdm5Zar1UHK5h9wszApx/SRX0CU932Ghb+5uQWMks9P41aSqdWs5dy+uAeR7DaAHlQBtVg2UmR+BISV0KtpqnzOWrchvm8hfRf9mkrzx4ZZMGsly+cZ4eET75UvtODVLXjrJYKxjnj+AlssrNU/UKlgnOlE4/PN8jQM6gK0pjEQhS2m8kzHylhxZDTNuCh1miewfx1KP4u5TrJMU0fkhgKBLp28eS8bqmAcn+AzF//VJnPYAH8A+Uio67djJcwo72koIbh2klWy1/Xo57FpTJAcfL3ny7N//XMITwQ6JlOZPc/F6twNejR2tOl+mPGl+05LGLReVgHx6/mCZrb3lI64mDpiwu4K3sO3ok0XhPUenrskhoMEYidHg9H+GyZZfMXzIETJ+KLKZ1FjmVlvDZV1kZiY7qpn1HsbpRyGggyPb33Nuwu/iVXRRk4v5cCfGpQpt+mQ5KTEko/9CC7y+M4Lrg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iE2qlnGOJKNdFMKtQg08Kgj3nVIO0pJy/OsepybnW285SwqfxFGPOHHxGvrVWgfMccv5Nk12Gza5z/wBsTO9gYX3IorpMudtHkowdFHzewQJML2x8mYJoMDfrtmtA1MiKOTJqmMRse9gd0b2vhz03yWKWSmG7oN8pDE9RVCYdxtqZQfjhLRiDt9marY4jisMRXNSStas5BNqF206inBd2jTnftHgGUlZJ0QETzs76bNk/E+mGzxQWWHTj8iIYzFkqGPWhbwE36w/sXQBNtcY47DmB3zo8WydPcWPLpEX4CDYL5hheRgMnE6Mlee+J+y5piDP1PALXZQuhpGS9Q6mO6ExcINNXp6ThQLkELPFzQpf9/TcU7wt3Isn5zgLD3PQHfiGSGUphCI+3i65SQmfutlqtvQ9mr46A+3uL/zGLLlUr55nah5z9Buxl+uBLLRCmYMn52gX2rt9DpskOqDTej08uA6Wqm5CrwputY0ftp6kS0vb6JnXEiBaFojW8XmRrrqzO06m/R6Vv7PBmF99kGNOGnydN76Pjsni4f/vZ6oYHfSjkaOdqGTiQyy5uf6TiXgcndYgqftblLiPpnHZRRV8PcU0S7tY8seyYgLjFnQR+wixjh3/hsDoDvr/wEmPBtnN90pTujehrRG5XPut51eibgIdMEOPE65O5eAfBbTHl0miwMeT5JKdbux7y0/4Tgly84oQ3yCRxHwRhYnGOGFZtk6qIwh7Cgm+H10kWoOnzeGna1ukeYjGwxHuh/ZaTrangkyxhlsvCPJbbOHx1oh7TX4A7s0/AIX4o/qQ8fPSXyLSAHdfR3EkUKJulxeKtCAi/nBk73pIk4zlsjS9s0dZxS40mLN9YetSAVvUCwrXdTmeC7BZGyIBulAtej5G7f90YoADzeTzsaMuUZUnI5DvYPBKJvPrDDUQElMnLk6QzgscNtwZhOj1r00C56OdPiAwwtt0Prq+hX9eBlnozBq40vGQiJrMxsrWby3q7cj19wMw227Ro1ojj9OZ67uJSagEDTWOILPzfIJeEzCmX/fQGxdUBtFw8C3Watsjo085pnwLRZAC/XjRO83ozZcaeY25toRaG+1pWV/+TH5aROSSSqCQT6NE2EpScSePFVHkgniLEuACZ1MWZDalQO6zG9pTMMiSYwxIJEu1xZhMh+6oXHB1T3eBVexNB9xnqSbaYNfOiqTzfUCqmA31UX7ir1FTB0aChoiz7465BmXRvcjLfRpbFieqTLyy/7UjEh2svsMJiohw9bqH0MGsfrLDybHpgvo5+OODOh0ggQfhbq0/E1m7SP8j0SfIn0p37cFSm/807P1NFo8JEAYQgokA X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7b7bcd5-b74b-4e6a-6de0-08d981a9195e X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:32.6519 (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: nf1I18bTmd+aFeCT61QYBDRAbiBzIhnv94gVXm7e90+3z3vDP8POSCchKr4gwzuNTg8Xfcz0/IzPBX3v34a8QQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass MDIO_NAME_LEN - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean --- scripts/coccinelle/net/mdio_register.cocci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/coccinelle/net/mdio_register.cocci b/scripts/coccinelle/net/mdio_register.cocci index 100f10293610..31a40360f99e 100644 --- a/scripts/coccinelle/net/mdio_register.cocci +++ b/scripts/coccinelle/net/mdio_register.cocci @@ -16,7 +16,7 @@ identifier readfunc, writefunc; - miiphy_register(devname, readfunc, writefunc); + struct mii_dev *mdiodev = mdio_alloc(); + if (!mdiodev) return -ENOMEM; -+ strncpy(mdiodev->name, devname, MDIO_NAME_LEN); ++ strlcpy(mdiodev->name, devname, MDIO_NAME_LEN); + mdiodev->read = readfunc; + mdiodev->write = writefunc; + From patchwork Mon Sep 27 11:22:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533289 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=XlbQgK58; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0k05Rnmz9tk7 for ; Mon, 27 Sep 2021 21:27:52 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 650DF83659; Mon, 27 Sep 2021 13:27:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="XlbQgK58"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4F77C8348D; Mon, 27 Sep 2021 13:23:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::622]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8BBDD83634 for ; Mon, 27 Sep 2021 13:22:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YOK8a5b0zD2Qg2i6t29X02TAk4QSiIqRzLacgQhriscfPWM4eVMUyHajxWsQoLMc3WM5TtTMUCor6cqAkGSbpCbfcLOAb6GTxst/7655wGoAeohjnfrpieoiBcdAjmgTxZPKHt+0x5i1rIu/qBynGj+cFReH+S+43ygJCBPBr+PlRzsgSISDo//R6AOKPOwEWUJMjjHixjLRSIVAvJwDoxx6Nwgy4is51mEkH7Bev4Zh+6VCaskUDGEowaK4VKMtK8mKFDQBMawQqy7I0jWyst+0zRM1f7gPrZSVa9kDtWilKKMiHqVsF28k07FjWplEffuBomYnVEfrmRwijo/QIQ== 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; bh=8o1SyUNSWyI5ohL8mmmX8/OrvyGicN4aCUP8D5eCik0=; b=BS2DxQVGBfdxYxlghufP9Vg1BhUuOe6+RFxfl0JgtS6zHELdmsE7DjXBbAu2crxdzJM9lg2vbPgTCIr89YV1/c1lK8rRG56tdrU243zEETQSsKDFm1IFA5o+Re1Q5zshK2Tq4PLuPDBLdMzRqsEQaSHaGr8ZpAF2z02sSdQoxcXNvXPB9gx8/mxT4CNnx72psov33sU03jv8PKefP00uQ0EMcoMoZZKh8J7WelRcgDB9xoTjJnqL5gNbmRis4gkpI35+TN/7bSjGUUfKcXGboUXWKGjsfyN8Ti8x1v8oKRm67P+AEtrkjGJwR396x61fWmK6CGqjCJPLBUZgTQTt5Q== 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=8o1SyUNSWyI5ohL8mmmX8/OrvyGicN4aCUP8D5eCik0=; b=XlbQgK58rv7MkGa97D0t9MPLdBt8vfwakPLUnKrOq9Ef3Q1Dcn/y91ZI3pPcfWEsixnOv6H1HeHtGRrsKqgMNrOqQKezD9TkYJqt5SsohLPL8c3TLuJFoWhd8VH4K2DNbSmx6FefKYJHI669BxAiqz2kSVPMtjt/FUDaySg0Ta8= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:33 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:33 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 22/25] net: dsa: felix: check return code of mdio_alloc and mdio_register Date: Mon, 27 Sep 2021 14:22:02 +0300 Message-Id: <20210927112205.301876-23-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 415e1444-d1f9-400b-df2e-08d981a919d1 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1186; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AcB2dGPZhTSOQfvyN1ysKIdbbumZWFxyEXTN2ocHBLt1lge/3M2mGlpe/tlBFKyMIoT48kEnUb86NFivhW+UoCr/canNvVcJDy2Su12EnM1CRxu4GWV0yc4t9rFIRAcPwKgdJrClqkLGh7U/h3zah++t5T5zWUfbmdEWzQi8+LfPhCQ6lplKTlm3c9SNNYheq4HHlRzU64+eYtkO4mQv7uIsPR6Nm+7LJzbOTnEu51tTOeLsYBuKcILV//yNYRpN40WzqVCeRWtopekdFy1KToaaxYhyMj8TALcKfEgfOcAKFqqJUD7BIWArYJz2QQHrOL1r9VOJG74QZnCPO5xWb+TnRNtlKE+yt2KdWPmxJQLajJuEZWxEkxAGOg/wZqhYy0TkWW8jxU6LIfd3Ea9fNUlZPchHVT33eFOP//hEdwo9epPBVS4H962+DWTqHGEAwMv3/tlNBDa6oiPmEwJc/mKWCYrwHqA6aKGh+jW7Dg6FhG+sPBWWaVOaBWadRCAGAbEKW1MZpiB7o0g5BpJgpfhANWqEmWSdeYZj8/Pds1HLHhrI1G3Jt8TklM7yAXmWUXz2Dc3OwUxVJCrAs/3V60Ir86f6BSdXIsO9YYtVhpuSgNqQYV8lQEFDrfmDRd4P2JskwpWd/H97H8aowQLpUob9eQWayDA3ftSzNZD1Vqko5uT2ZN2rbfP4xrDd+g8EQ+jgA6zQTBeIKLO5zfjgIg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5Ij9RSHWCQBSswHF3q+4Q2I+oB72fupmbjuXdbrXigXiyEQhT3ULG5+RyZ/manv95jZpb+XxmGaNN530Ri9iEPdN84vHDfOUNcKthtfWs9dDS5slZLsFtZrcSkqLCT5mOb55A1krjhM97kCZaWkngf2/pcHVHperWqlabCNwd6018d9FyFAOPscW2Emol4ApMV/2qqJ3VKikTpwX8ilxKSrxesIBJz8GDSSpLwRyITMwbVJ3IuGInIJWAXJv859tkJkiVz0NE6THBIfrn/UkOPu0/Zpved3JKN/jI5TydHy0EdSD3n0wPYGEBhhOmagGQVEK0wDvYu2Xyvb9NerAdc9PWf/Y9dXUYip4HEhI0fjD36T2FT4+Gp8GVFf3IS+engWoPgTUxCzZadOK7VWJ+oD0++3p/U75mQcRe5vJkAqjDqG8nD+mkF1D+3gYg1IOEBKvQTjewYyoPBUe+EzL3PPmO4347LXdQPhkRtvrUhJqGkEVVrnyUajVLLQwAlgHvk9ZH3ZFdZVzV5UZlHPAUniKJRFZOXztcSjoJYscgMqrz8QXG7IjpW+RUWyWnul2A9TYmOSUP37m1xDCOk+LCjp9OAYbk/QrxeSrHpyyJ/lGIimenC+r/fUmlYSplL+/61kKi4MYRPXqtgaUGStU+C0f+qeb/LWEX5cxYmUONYsuKHNYYbsn+sEs76NDDnpl61QPLd/w9iCsdzt2L49aXATv7JCB1XRIBSoTPPubk0D3E/UcQ9mzUUwBlp/y3r9lEM/wfiUqQX4OOGLN+daKo5641glgl+wEyP8NB2mmAWSeoNx0Tmk6aDmbs08M5gLX1i9+SJ2+orTB9BIy8X1WKM8kKL+qow+lG++GU+wpvn5z0PI7cQHh476v3OWhaGpqV6pGLZzpGGKf4pfN5YEvvFwC+FxPzkfdSZ2g3ULacAWbNT+8tVRy+HMPay4URSiNrXtzV8D0sPxMxU4fmgvaKXWa7kQOdkb6wlruLvpDLbJIILkNVCa/GqMNGyPN6SnLQ1J2ChKfrDLnGGCjggrmeeIAId2AoSI32FezRBj7HgOg0UxdAGnBojL1nJcxpiz0Kshl5WIdPBJZwRyfBtb1286IYvZjrHcrB/vQBA5ctVOHfp9yxF4Xl1O5ZdGD/J5zb9mDAJPTSOYRcZdR+3omAPvzuIA+F9m7mhe5UneSGCIATVbbuFjcTZxG7bkX5S7nB2KPDCD5+cJHIx4dblxvG34dh5tr5ysTBdZ+ayfZUtQy1TXe7TMjaBYGWgZd4fXxbnHtqPpWs6IUGqb0nXdZapjxmHkOpv+1K6O4msHQ5hSw3KyG9jx2whFcX/Y2cO+Q X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 415e1444-d1f9-400b-df2e-08d981a919d1 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:33.3985 (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: sND0eBuITRRF3C9Wilo9siByOO9Nkf0W2i/FZ2Q+f6Z4R0Eh4Ec0Us75yXvShvzgfeuIgEf1kW0RddTOCW4FZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean These functions can return errors, it's best to catch them and trigger the driver unwind code path. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- drivers/net/mscc_eswitch/felix_switch.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/mscc_eswitch/felix_switch.c b/drivers/net/mscc_eswitch/felix_switch.c index 4c2e57755967..98ae39e81d65 100644 --- a/drivers/net/mscc_eswitch/felix_switch.c +++ b/drivers/net/mscc_eswitch/felix_switch.c @@ -276,6 +276,7 @@ static void felix_init(struct udevice *dev) static int felix_probe(struct udevice *dev) { struct felix_priv *priv = dev_get_priv(dev); + int err; if (ofnode_valid(dev_ofnode(dev)) && !ofnode_is_available(dev_ofnode(dev))) { @@ -300,11 +301,18 @@ static int felix_probe(struct udevice *dev) struct mii_dev *mii_bus; mii_bus = mdio_alloc(); + if (!mii_bus) + return -ENOMEM; + mii_bus->read = felix_mdio_read; mii_bus->write = felix_mdio_write; mii_bus->priv = priv->imdio_base + FELIX_PM_IMDIO_BASE; strlcpy(mii_bus->name, dev->name, MDIO_NAME_LEN); - mdio_register(mii_bus); + err = mdio_register(mii_bus); + if (err) { + mdio_free(mii_bus); + return err; + } } dm_pci_clrset_config16(dev, PCI_COMMAND, 0, PCI_COMMAND_MEMORY); From patchwork Mon Sep 27 11:22:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533292 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=Hdu/ysKT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0ks36DHz9sXk for ; Mon, 27 Sep 2021 21:28:37 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E285883685; Mon, 27 Sep 2021 13:27:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Hdu/ysKT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0BAA6835FC; Mon, 27 Sep 2021 13:23:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::622]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 23BCD835FD for ; Mon, 27 Sep 2021 13:22:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=km5KFqtlusg6NRYmfb8Ax0Y7mPHg1iq1+LTvwz2zz66grjVZpLgG7h50pxzwxYh6XqRKwdYbADjiMByAjRGjNMNquUn4rJl4Z+b6ML8uNc90u7ph++UiSBXQTw3EbCzELClfRtX1Lfrfb+DpjqQyV8lf1piIbtj/NBeUho5g234ZBU89buOy92PS+0xXsKhW0M9G+uKsiBlgxJlYG80PGbyuGRVfLt5SQikyAC9yIt8EudQMPOjSeHIUvTRwcbjXsDD+PL9T8BJJG7t2xwd8KQGUT6ZOnfp/Ggkcn4IPTuesqwy2Y9QYAN2Jg8YjbFBMOKUomGDt6UbolFpo7N1I8A== 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; bh=VjFn+pghxwKj4FHZbrXSazxTur0v+S/8SHqaUHr0rKg=; b=PunfJT5HgPDpC3eqqLzFc51KeM+eGpByhiVhsu4fVDiQwVvmPtdR6FZLrfHYHCIxbCDDliOlrFijndqrPyoTyVVmf5eaMiNyxJITYj9fdTrjzOuOLE3AY9yIzo8ahe6raJxi1T2pyF2FwgzBwTvu7tazZ/uE5Sb2iV1fKlTIzWt/wFcWgG3iRZoSq+ybBbhlp+NBHruq6zQ5WYKGYssCsUcpsNlYIK296l9CbK8tiycurKN3rtNHiP/+p/54auh0mbali7ujZxnuGFtBMpIlD4yOjyV5JnU+OWoi4j3+darsERPau4hxD1MUy5kna6uYSeL0VkRk8r+smhU+ZD4c+w== 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=VjFn+pghxwKj4FHZbrXSazxTur0v+S/8SHqaUHr0rKg=; b=Hdu/ysKT9xXbHHLuLG+QlfHYhXtK2R8hVfmf3xcwH8eyRfTVDpCBGH/a3ldkCgrdgtetkwffIiImbqYNaxSPs3GVpQNoGt+19H0wl8v02bmh1uAHAgXe9Q3kP3/zbDAeF02rMw3ikFHzHXb3gTlhSo/S/F0OdDyBi67+FlnqmSw= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3839.eurprd04.prod.outlook.com (2603:10a6:803:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.20; Mon, 27 Sep 2021 11:22:34 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:34 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 23/25] net: dsa: ensure port names are NULL-terminated after DSA_PORT_NAME_LENGTH truncation Date: Mon, 27 Sep 2021 14:22:03 +0300 Message-Id: <20210927112205.301876-24-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 03917916-7e93-48d9-43b7-08d981a91a42 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4fsQcCe3x5ENhZdAzjGGK301eTS6Ly0O9bZw54zyY60QidXKTVIWEZusEQPqE9kkjzbEfMebG1bHd64NAMChnBuyu5d7xq5e1u9pNxHVb6Bw5hQpq769pIfneN4uRhTKI5nch9uSTQtFGLj2dcPcqE5s6Ti78mX05UohsvAuemSAYTVOIdevZ/RTQYrga8kRf07efU/7UjinZXjsvxiffvuC7uVGfZSfeHkF6/eXnekMipfaFX5vO3lQ6LOpvN2j8PKotT94xMPN0/Uf4K/lNXDJfljLue6bxT8VIa7IY+FlBBtMPoIFX5ONvOjSxs8e4EtLfgqvifQvzEOjU/sFLwn3Hl1b9JoCIXkUTkv2raUfLCQII5IFM9yQLTyGwpt6j9xi0pK1Bj2SSOt5iGWwCGp6Uf5z2B+HungH0qE5fGIdL2mD2ODYJ9tWevhOQNVj/7XjU4pOyu4aJ8xDsJ9sfN+m8S0Xd6QmUVJPTcyG0BrVG33dzMeGTWIQS5HcLPhGYjjjo+MkvVsrsz01bPBEYoq3rQeizoGJTGaFBm1YHkXOXYLWZAZMQeKt4rnAmxb4bcEOppv8YnxedQCKzD2o1jz3+W2tFDyYeao1GpJ8Gy+dvWiGnTc5l7IuNRSAJ2zvvTHE2bQ2//ytYNiAYTX7NE0e8LVvr7S+LM7Ss8ZKECqvv6TmUrDkf/Ykuw35rjIlyIu5lluaGnnLSGsOArx7uQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6512007)(6916009)(956004)(6506007)(8676002)(38350700002)(86362001)(1076003)(38100700002)(508600001)(2906002)(54906003)(66476007)(6486002)(52116002)(36756003)(186003)(66556008)(66946007)(2616005)(5660300002)(83380400001)(26005)(6666004)(8936002)(44832011)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: drhHpi2tMUq22Q4W/Ev9B4IWYeSYIsogllJE1uAEFXjXNaux6cgZKnfN0yq3optyuCFN+zAeU6OQMjDFew+U5NPLAqWaqBHwneex/n4vLJv1GlZHzpyeBT+r2hmYiUn3yBdNqqHMkC53cb0HQyw2b+E1BESeiKHutVJhCjm2PUwIP0S5uIn4XPJZ2hPmrmch6J7vVTHZTqxGV7oHxqEtPuoLKlTuOMc9M7I9noGbngWsZRNCCK1GDq95dv9x42iMJHehCdgv0qa8A8Qpa386iTFnJibs6jpuZg9tGzm1Ys2k8ZjG7uSQy/PoWrb5NhZotwCBM7T0ZUVhPRVCNSOXGhNujeThprP+Hl66hZr/CTnojW6m4L8g4si9vT/fG4s6+/bCuixKm2OmepRHVt0OfjB3O6f0QG1CaX6kASv6piPVkS0BSKvhKJfNDdK67ZA1MsQNIXt5gafNGpsGjn1PSrjFNYg6bVe9HUTTtAdBxvrij3C5X21bGwXQXH7gmOIvInunGsO29lnD1C0M2CdJiKIat/XrPbIudIISnlQsdZlgQS8dR/ZkjPXbH8vqZIc8wWgejqh2uuLeCPFbzB/50L7aZNY0k7fm6kKSgp5j5MIGis0EvFFJANVxP87p4j1dpqCEtg/+OCdMwXwW38l/dSyl/s2gyKr3Zrfg4ScyhvKvbBWoIlXPEoxPa8UNwtgYpahT5TyVIGJbr5DUB3kRlos/Dgo8hNkSQZ+j9AUtdBi30By5icGhhPXcmGI78zLft+jpqjvHPNTgTNOhYISqNwEuVgoiO3ae6N9qNmqvGBmLR28dzHsYbGRqFRFthAk0V0fNpOT+l3hnHOx7S9ltt7xxBID/VGI3FRf5+ueuGYnBj77/39/+Qu4An2HYL4TCSOqbENrUDeNilVKOJ+UVBYH7p11OOcb12zQXTKLjjPRFLp6emJmgxc+nYLTqOWPcUfMHX8DnBTPjRcZYeo1GWUtfNfP7Kj3pfByBVf8/hDd8viLfmcN9JDV2mT1TZK6sSQsoQpfGqyudWhlUKTIbnD90ICvgsq8eb42SLhj6DklQ7EL0P/GiDtwioAXxDJlbBV1VIl5OcwkNqpvAsITDiHHZLZq2vZgO5Mc+H/QvIK/brvwaCiX3mb4r3IXiC/ma+4kROPVDXfSFeRgBgyqHPo9VkS/3k+2M9j4iGJ9LvBFuBsdoH3F30Crm8Ysl/xs9PwwZhpA32epo/gEERiwfNONtX//Mz61nl/x2+gX9fFUAqvJS1frxE3msD/vES/KE/gh7TmoNTDhER1Uyfo6b60oAFPJG/RCC8zw1T44sB871TrbQcBtrNklaV7DBbZRH X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03917916-7e93-48d9-43b7-08d981a91a42 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:34.1501 (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: QTKu+BHmOWwMZaEnqMDISc+kA+LlNMG1eGXy9ZhcydYTg0CiEuTb5OtO60dECjYcLIxF/qEw3pKhq7CtMY21dA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3839 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean strncpy() simply bails out when copying a source string whose size exceeds the destination string size, potentially leaving the destination string unterminated. One possible way to address is to pass DSA_PORT_NAME_LENGTH - 1 and a previously zero-initialized destination string, but this is more difficult to maintain. The chosen alternative is to use strlcpy(), which properly limits the copy len in the (srclen >= size) case to "size - 1", and which is also more efficient than the strncpy() byte-by-byte implementation by using memcpy. The destination string returned by strlcpy() is always NULL terminated. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- net/dsa-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/dsa-uclass.c b/net/dsa-uclass.c index 9b8ae1e82b92..8db0de686e2a 100644 --- a/net/dsa-uclass.c +++ b/net/dsa-uclass.c @@ -221,7 +221,7 @@ static int dsa_port_of_to_pdata(struct udevice *pdev) label = ofnode_read_string(dev_ofnode(pdev), "label"); if (label) - strncpy(port_pdata->name, label, DSA_PORT_NAME_LENGTH); + strlcpy(port_pdata->name, label, DSA_PORT_NAME_LENGTH); eth_pdata = dev_get_plat(pdev); eth_pdata->priv_pdata = port_pdata; @@ -433,7 +433,7 @@ static int dsa_post_bind(struct udevice *dev) struct dsa_port_pdata *port_pdata; port_pdata = dev_get_parent_plat(pdev); - strncpy(port_pdata->name, name, DSA_PORT_NAME_LENGTH); + strlcpy(port_pdata->name, name, DSA_PORT_NAME_LENGTH); pdev->name = port_pdata->name; } From patchwork Mon Sep 27 11:22:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533291 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=Lt7N3U/G; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0kY5XJ9z9sXk for ; Mon, 27 Sep 2021 21:28:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 61B3783657; Mon, 27 Sep 2021 13:27:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Lt7N3U/G"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8EA45832AD; Mon, 27 Sep 2021 13:23:23 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0613.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::613]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5FC138362C for ; Mon, 27 Sep 2021 13:22:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ezJ2LNQUeQCIkDKBy0UZzrV+Y7DDIDBJNTKHQwj7RcFG8p44F4qZTAj/BoYnX65by6zHntR26WdVhcIP5omz8fXmAQVLR7DlluWJGucVoD0R/q9g6IppT2GoJtvMYDt6haKpa5flAb5PLUmTkuxZF0e73c2DjkX6pK/Zr4tZjgiCmrEyA922daX5T0kpozzv88AKoLSFFukatI8i08Hf9easiUSzQCXM0gSjoucFeVZV/gUzi7t1PI/pAhmgMfKWcM+vtTIPXE+lpcmSIvgtEKIR01BEsX99+qgJXFp16/CTEV3spiiU7Y2n1qFmgBy94i7rrwfpJSTUFLBz9om52A== 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; bh=sSrIwjK6sQriYrJMvaJuxKYstW+eNgvkVzJnB5Ld8rk=; b=HuLmuhhvvuUEc1tp20TfIJ4M3jZG0zb+pQbBkl3O5cnRTxTG2kDt6xD+9S5bz8CtB+jZNVsjTUxs3+VTfK251vOKbvkxeOqZmbYzoI/cQ4WUIVZTy5xbLQETrPsUiD2+eiqChpxYNOc7kyyO1kIoWJ3cwWkfhWMGyGmsTCR+XVOSKyNsNLLdLfrW84j4UpuCf6hfuPaN17+wTtMOR8zQw+GYgxiFKM5mP74GcCi06MKG8wVXOseZuDqZ5HBN5M3cOG5ucCAWnQkOF013VIFeTq4aMdGm17laOxk6Je20b+UllyhDgmdgQaUi8PMds0FsvRWN6Df2jSQKFtLNQaUweQ== 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=sSrIwjK6sQriYrJMvaJuxKYstW+eNgvkVzJnB5Ld8rk=; b=Lt7N3U/GNRhNLN5jJhtioKKHWs6IFWRIc4HSFAhZMck5SFYmy3B0GVWRWxRDoA+rMiPUmx6OaFxjJpVwLXssouXtSkhJ0DaQS8ofb8dbTNusmnZ3E47wM3d7TaFuxLOdv9KUek4Mzf+jCn/rL3QMhTmZyjXFSshXjgvSh6Z3xyM= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR04MB5341.eurprd04.prod.outlook.com (2603:10a6:803:3d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Mon, 27 Sep 2021 11:22:35 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:35 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 24/25] arch: powerpc: mpc85xx: free MDIO bus if mdio_register fails Date: Mon, 27 Sep 2021 14:22:04 +0300 Message-Id: <20210927112205.301876-25-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9a9fe2dd-ff1f-4719-7792-08d981a91abf X-MS-TrafficTypeDiagnostic: VI1PR04MB5341: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:813; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YDatNpMUKhtt6cQnVyqZJx0k1uIzPG+ryUDPmtctSshrb5Alw8+KfcPLCXBHd1Mh1ahSVk1jiRQ14zRxa2DFGz9XmA9GChiTGcvDOpp31+u08pmvZ/8yBoLDaaATBkdlGnAvV7P/nFVnwMyTNJiZDz833Dpa4Kf0nXfBNvh35bJAPuljrQOx239k5n7EbX2gD18Qyr6GBB1N7m57xMaKzfae4J5WnEWHshEsdtFNS8P3R5Lzdxnd90mHm5OtjUYg15xnKSNs6gthu6XaUrsXK63iT1bJAW41Xn2ZBuWEemJ8WRaUhNs98tiVHu+QsbHK1hQW5EszHx5zOiXiTUUFpFQIUs1m/sSz7u1CEvCquwxt5SjeAysUtH3r+X33fX5SjpMv9b7WRVc15oz/oNiy038+WlE3wrl5kmCrScZ0xOpwsq48bFbR6I3XNcoEP+BboJxE+WHPjOgMeqD1ENAYw6S6St7yRmS71EADrC+ppjtVvCChPHCxIfil10e7jujWOQ4S8W3SEc7dVZACpImJdc9ZphaZkiDargsTNkpWGsymztZ3SV22YYrCpxgec2t7+S0bnbliLHv15qFNqtPiCAWrYGp4wess0pE2RXZygbws+m7s1uGVkMMXad96TfJxDYoATqLpVtyGGyllMiT0tg8a2QD0C/HVL9Xt3py5zTpu6EV3EGzKMjlHtb4SVKoq3FKRu0lHR6RKJO2ZuIfnEQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(26005)(508600001)(6486002)(66946007)(83380400001)(66556008)(6506007)(4744005)(8676002)(1076003)(38100700002)(38350700002)(5660300002)(54906003)(66476007)(186003)(4326008)(52116002)(2616005)(6666004)(956004)(86362001)(8936002)(316002)(44832011)(36756003)(2906002)(6512007)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FgujbXv1Emsy03MdDnPZIt4tIeot528a3fpRgknIlPwPYbEkML4rDBznPTbYJdKVl/2qmgPNPERJx0vnwFy09zZvbL9kdr0URoC9hk6+9w70Z8xrS24DNsHVBjCH1CK9fE5ipKmLjachI3y4ZI52XLjEAwl2SjQ3CEVuwRpl31ckCOJ0j2dB0yQcQs8RKI0w4RH8tJ5vrYZsbyhUrb0vlEAAIc2NOuy3rOHp6gZp431X1sFHpPOmKqV0hvMf+0pwAFAlxsyICg0G9LlHW6rEfkdm80t30G9bvgBaCLPxAHp8H89oHz6hnP6NG+7U9nh0bLhGMe/5dL4krLk7lXNcS5EMngkqa2oROvvj4qWLKu8sCUBZhmh5Q2riieYZIvMScYf6GENuCJVwm/WGeTU9NIiNQoH4YaaaP891A7acagHGkBkwOi2vv8rNuWiy/fbD4Xf83gpcARa2qzSBCTf/gMohPTj/DDEE3+q5xDLOpUGqswpyDtZoRk6Xnyz6xLHRwg3wo7K1SL0FsdI3YYGfhl1bPCCl3rQHQ2NvfIuPoeLWFDFUw+0pH1wztrAZOJZxqLIKoEr+63mcyKIjtFETTRU6vBUNeoZG64ngAPunxqphONn8hGgmx9boRNRzJVCefhlSHxQ3qOT5awFQBYR9eR1PKF3G6lodc5iNOAZ+Z7n2NmuomhPkxyLiJovv6L36958T8d+BrcMeG3qTqYZRpKyyqOkIZ/hqLHHu3bYnj27X64yt9Q+95TbN/pMvbCAidJTS++U35QccCn0Bz/onT9a/mtbraV6uHmR+GtjLGxGr+7usxNjCHT7+sBoKL6CUwD+jjmOA93y+JK7+1xuJk1Iu3l+JM0cTS9I7T2sA0mNssIyURmVm3KXJ85G/lNWITRxRM9LsSakpPsRVko61oIyjl3pxQrTLv/oEB/ZCYFITfBRWbpmLMaAI9ZajC7b8iOtfVWPvGSmC4+nKr+HTkT8eoazHJc9cKmhC+FkGd18nDmfdYV0ziz/5IQL7Wvwcic82kciTEioVC+KUqUinOa7Kgu+z3O63/XHezEbpLkQEjtqt76aA0/9JaQTkxmBhYSMUboLmiTn0tsNN5D7jJXn8SEkRHqUi51NZ9FjIctina4Qa4iIUu+Fkm0mKo60mL5E819wNxA0vB5nrDLpVcYUN11/7wn1dndhBgTFlOkjUitQxxco3L4CvdVxTaWrC47F8OpKxa7Pj5vw6bDxDuY994o0q0+OhxNmanpwsPvaF3rRJMNMUgyXnfX3q9bCKS/Vv3Yq1ee8FQj470WD0QGbwWObWzFJEoS8Vn0jUakshBqxQ+xL55vlhrppMK3fO X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a9fe2dd-ff1f-4719-7792-08d981a91abf X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:34.9716 (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: ivO2zSHAiwBjyJeO9aj0A8Bh9yvqO+AKsl7ML9OXQGekD0fBK/I4lBJgFwr8guyb5dVgpCKzAK/FEP4BBNEPew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5341 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean If mdio_register fails, it is nice to not leave behind dangling allocated memory. Signed-off-by: Vladimir Oltean Reviewed-by: Ramon Fried --- arch/powerpc/cpu/mpc85xx/ether_fcc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c index 1f6f55707321..5cf0a3fb227a 100644 --- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c +++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c @@ -449,8 +449,10 @@ int fec_initialize(struct bd_info *bis) mdiodev->write = bb_miiphy_write; retval = mdio_register(mdiodev); - if (retval < 0) + if (retval < 0) { + mdio_free(mdiodev); return retval; + } #endif } From patchwork Mon Sep 27 11:22:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1533290 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=qvvvfmWg; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJ0kG1RDpz9tk7 for ; Mon, 27 Sep 2021 21:28:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8B88383620; Mon, 27 Sep 2021 13:27:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="qvvvfmWg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9EE23832AD; Mon, 27 Sep 2021 13:23:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0613.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::613]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2210C835B9 for ; Mon, 27 Sep 2021 13:22:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nv0F+4wZPrxPWX2yP6ATOqdbtA4HFHZ34P0SatvOuiQg7nkgrHfiYdobXxBIWTVvzI32hZ3btI8yZUkCfa4BK8QG7XlmxeZ4OPmooZI3dQZ8I9uJHSRGGoLM8nZ0wrV3OtUEOxkpzwPI8/w1xIItOK03NyrXcBtMUV5YFBhUj3p7uiYQOMCvfhLXKHg7oYCbCkATuzFYyColpVa4eFKEtbVzVGAe6aD056t+Xv5vrSfElUPRYUBSKmi8sY9qKNqbGyF9CA+Ftuex+Oe4uT7XQuy4BRBRz79tNDUrwBhndiru7IaOX0vL4Tu2neA1cC0w4JVRXyzyr8pPbWNQ6qw4NQ== 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; bh=vrf+zzRb3LEu8ddaBqwAgivGI2z51Lj71EMHuaYnfvw=; b=RORs+yd7TVpNUjOKzZ4Wuk8PlO+5SqSbyTx6qoBzQEXbLiOf9+T/lt6p+U9qig/g3YQCp7zAlvJW7mum5pTBH06vNf0gkeHSOtc/PFd635QkQLaPFhZ1WAreX5I+n4+9wRlEerusjMPEuQ+Uzh3PC361UJF4VZVBnLQghHYuBtMOU3FR4tlStdAYaCLifL8jwZ/pLV0N6qLM5zyMxfMkLkGaC4Z3DCLY3MFTQU1OufuwMsOsU6pOSwuh4NXJvleWA7e+GoqhO4UJkdW0/T0kFCqva9T0W/c2hWNs6Lh3R3UMaR6KTfDVH8/OWBxUKoARt+qzm9Axj9Okp1E0eJkU5Q== 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=vrf+zzRb3LEu8ddaBqwAgivGI2z51Lj71EMHuaYnfvw=; b=qvvvfmWgDDME5LQ9gubvgepsvF2sNYqiy4qI+ccI0zpIJN829YN5DRRDjxRw2aj6lmoXwhQ3+2sqFMM2Y8AJgMFCvNIJwgDTmcKmzqOt7bkuVFH+oLO7FhZurQuhxkav3A4Mbv7AQu9WsTMXQoIfW9RhWqUzYfe/8kcxPJipmVY= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR04MB5341.eurprd04.prod.outlook.com (2603:10a6:803:3d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Mon, 27 Sep 2021 11:22:35 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::e157:3280:7bc3:18c4%5]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:22:35 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 25/25] scripts: ensure the cocci script for miiphy_register does not leak the MDIO bus Date: Mon, 27 Sep 2021 14:22:05 +0300 Message-Id: <20210927112205.301876-26-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com> References: <20210927112205.301876-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 Received: from localhost.localdomain (188.26.53.217) by AM3PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:207:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 11:22:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 69adff63-89ec-4edb-ed5d-08d981a91b30 X-MS-TrafficTypeDiagnostic: VI1PR04MB5341: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1468; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YS7Ijj121kebu9AS16ZK1VkBtCfNZkGhP5qyghpy76nbJAlFbeJjK+LUgjJzQzGfY5nWqYCBFYaY2pLJil4XSxMN460FDel2WhLLvBECcifXxBOwlMGj0RlOfl4NTC2d3bagHWf17eXs5DGqNNukjWUIuOWhc+T2cGU7WnDrT/ch7WLq9qvaMc13HYP0TOZZtqk9AHjp46CpqZo+9o4/xuRACqf4YjcNq3XjdjK2jvIlD1sQl3ZcnWZG9RG93bw98kVH/HjiK2z7yJmbRKLAaF+JXA466D6hIZ+Gt/dvg5CrqFP4Ua5UOcdrSNxTKwxJ4OHpkOpveS4dV1og+edNwcE48/vaLxp2rra8CrqrrfYr7kMU7LqvQff7asY2KAXJtvA2p7eUxzUaD+VqHibtBwVTci6ho94AiAMze1RQeJiqnVMJDdj/7ybct0vgV02Ay3II+oDX04pZJnRDe2Jyap6CeeZiSbFntCQkAj0lqw67O9pLh394WJ7Q86UmaXLkNJ4SnM2lKRjxhPD6FQlNoi6EdZwa2Vf2EP/A82raYbMpoQ5W5OlZ7tzSt76Oo2iMmW1iPveHGYv7hpUWezUm1cjKNGeqO2bdRrENxN+Q/+knAkrTF7VpqQShjlX3o7vDhUuRZTBx6Yt98sQzO5KylBSVMX/drjpfUH8Y2rlJhb/dc1Ks86wkSN5j2DVbqGLn9CX/aA0rIxAeqPTPRjvcWA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(26005)(508600001)(6486002)(66946007)(83380400001)(66556008)(6506007)(4744005)(8676002)(1076003)(38100700002)(38350700002)(5660300002)(54906003)(66476007)(186003)(4326008)(52116002)(2616005)(6666004)(956004)(86362001)(8936002)(316002)(44832011)(36756003)(2906002)(6512007)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: weMh4O+VFdCYyn/WDoHqcijiQuEdniLUSPtXhDRhwLY0vi3n6abIyF6nkLW694bq3oe39ivGWo09ck3hr8MWYUmu7gQZngUgWbb1iL5IIZAWoK2LQJcTwc9MevAZOUrBJwx49bboPEFOY6/i3QaFK2r/Cs2c2eWfwZPy2+ljXrVmGzHuBWdPtHOEhy87R7eV/fTYEaNOZLOPfi1pWFe/VH172UC85ZA7GZcvaaMsTuaVCQ8scYI/L2KVI1JIqfWOqRp+iK5wMSdpFZcTz/JCZNztskOnMRqzYcDNXypFgA7VYKIfLT1auZfCSdQjqgY/WVHniz4pV48GX3EwpRozus5OjZ6mWL5+YQxlnJ2hQBgd3bMJPW0Z96dvNqy+HBMKh0+8775h+GPPoJmb1i1hwhTQ5WpkzD62W5LStMhXcTGQdr4RPss4AW6W5R9oEjI2X0NRrT2WdiOL3rz5b0M8EvHpYam+gZWUUpEGZ4sdSEogNzr+ABjBeto3H5rj6IpaAMW78Xrl6EtUkL7ymPgYZ/J7JSBNpD8eAQbCwQcZtAkIvwY0ZcojImdkmfa7hjoQ2K3xfYvo7Y6GsdOrHlwHboecYibAIDWmUi3gYxzcbiTsdzBmUhFeNhKuIoujwHOlSvJFHi1WEplrDhJx4hHvHLt0BK/k53edvCV8wl4F2jdK07szuQ3ec+M+0brXrR4lx7s7NLZ26o7svi1RcJvPHdujrh4mHAAXz2tuTLUNQycZXCh4oFhJ2zNsSnoLFg+HBFQ3w7BVX5y7CcW6eHLOpCFCGoDuCSu8D1nDZqMt8rYtsFgbsb6YqWr25o8XW/UvoqaU5pstAYMYy2jm/5CKao//9nC649hOr0gQBIYShRYflSbitAYE5WAsu1IYAcxkluacPqyf90D9Snem0CGpOmsy6Jfs3ug9fBSCq2G7oZejjKcR3axv2PsjZ7K6hcfSPUbFz43MROPaXutDHQVMIkyna4y16/ntyYJLym7EwgTpQnFRLeqTBzaKAOWnrI/pgx7CetnR/M+lJNQMG28WCV//0lolJv88l3jW+BhiUqPVh9y0nWync+KPpCz7ZpmPpXkQs253OIsoeshzF+FAsBOHDRDFLR3JlUGyLxK9KX2hDeq/k9R19lpEbDLXpUGUUvbGhBgVAXWVHBmKA74XO9yj2DXKfFRZ/l5FwVPFnEPEtg84LJLbGjhJaPOgULcHRQkrzx88DdzyjAmJQkdWI7Ym2tGa2GrnWoYoWEDOd1DGyqEkTB7NhykLGFBvRW91bC2MjlywtdD4YKRCmEUsXx+fABx25VFH9k4RXG2X/8lrwDe4NYQLsjxkN4j2Nayb X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69adff63-89ec-4edb-ed5d-08d981a91b30 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:22:35.7571 (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: ovfMXyCIJZE769ssHZ6Ltj6qY6dR7JH3uUf4m7rb+6B+Xro+Z6zv8A3eP6CSCDeJenQZJw2tgLXStdBNq2+Ztg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5341 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean When mdio_register fails, mdio_free should be called on the mdiodev that was previously allocated with mdio_alloc. Signed-off-by: Vladimir Oltean --- scripts/coccinelle/net/mdio_register.cocci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/coccinelle/net/mdio_register.cocci b/scripts/coccinelle/net/mdio_register.cocci index 31a40360f99e..7d11281f4678 100644 --- a/scripts/coccinelle/net/mdio_register.cocci +++ b/scripts/coccinelle/net/mdio_register.cocci @@ -21,7 +21,7 @@ identifier readfunc, writefunc; + mdiodev->write = writefunc; + + retval = mdio_register(mdiodev); -+ if (retval < 0) return retval; ++ if (retval < 0) { mdio_free(mdiodev); return retval; } @ update_read_sig @ identifier mii_reg.readfunc;