From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DAEEC433F5 for ; Mon, 27 Sep 2021 11:25:40 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E309C60EFD for ; Mon, 27 Sep 2021 11:25:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E309C60EFD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de 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) 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> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: =?us-ascii?Q?+XZWsrM0rZumqyB5OaOQWMfHgZakzaE8G5XXl/W3zNO/qwaoV2ZCahGw2pNk?= =?us-ascii?Q?63vGc0CF1iKxuA5u20sB1WoAxGOxPljvlWsRX4+jdAETtru9i73Lld/alUJI?= =?us-ascii?Q?Emr71sL5zPDiCsfrU+7ChS5Vchj+o7YxeTb6ooQ2KlGdFz1jWFxv4co5NcoZ?= =?us-ascii?Q?PvIivemH79K0We3C7uMQn5t+eb0tx/RUv6Vqql5uSZZ2/Z3SDn3WzOFxQC2H?= =?us-ascii?Q?ryyhHn7qcoNcC4Zh912JVoFoJDfYc9wblcvmgNW/4U2/puKnCx+hfFFk5FoK?= =?us-ascii?Q?T5ClBqCl/ILyDxs3r72u4Sa5Bb+lSgDMLT+aqJVxunEQdZXTStAyEgegOuQ2?= =?us-ascii?Q?+Xm5BYfPEm186nS+GnIEQpauDK6K/t0ZopaifeAEa1yr+BOc1N8DFAu6s9ae?= =?us-ascii?Q?U91mcX4j0uDREDvNyMozEYab6knafVMbNZphli2ibLbq/GdIGk4KEjazB/xW?= =?us-ascii?Q?HcgGl/Ux97IUBZnDmjBvk8jtllhSdCrV73xLlR9wn+Llw2mbOUNe3muOyJn3?= =?us-ascii?Q?h90d3MFYqXcriO8Jtiza9DLH/cgio0v80oar/pHrSQb02A6gRmZoNSY47O3c?= =?us-ascii?Q?a417bwpdks4dfvydFATzk8qY/PrGd4FLZtGu7NUJ8uBlBah9XL3m7IIbm3cE?= =?us-ascii?Q?gsGgICh3jcqZB/5uMaZ3JEc/jGjIv1XmNGu65XDYFrgGI2NswRKMJHLS8PNq?= =?us-ascii?Q?Vn6QjacZVTaBWKvWJtazQWxrbDsJdKYYqrpKKTd2j8gbeOFtoN4bbI/x/SXl?= =?us-ascii?Q?fS3bn/8l4Bk9HXbrEuhZJ+YJ8lNxsKipmPnuUiyeWUpS5itZvA7+9YXdtXEs?= =?us-ascii?Q?xItqi03w9t3Y/N2FAEpynAmCiZgwc+r1aByLjNnYBPA1DyWMUqbVK4aRcG9D?= =?us-ascii?Q?FobD/VY/Zkf2nssqJsprMYE4CBF7tkx4cxIisl604415KkDHhIy9PmtGVUk0?= =?us-ascii?Q?/PUxyQcKkFcEePxTMHqhNx+R6cbDhiHR0lqK3vP4JqX9Q4FfxtqYH028SiXj?= =?us-ascii?Q?LH4quMGqnASGOFDovSGcJSMI4j0C79NyO90T0Qz7Tp4sQowa8PJ0rHk+8KWM?= =?us-ascii?Q?CRNphkPSs104cC5RXIFIHhlkEyB1jCwfFAwMBRgkluYAj/7u5Ne2bViNgDx5?= =?us-ascii?Q?B4aVcKCfUfSTT9aMhko80MBSQtZGE1IdoHyODNlGTlP+9pRjf9n8JT9HYpTs?= =?us-ascii?Q?MIbCbvRy8E9kqcy0ik1g/65/g5A8uY2ZR5cm6qWnZUgEwurIaG8Ie57YaJ/d?= =?us-ascii?Q?rVThBFyJntBReryC8ZJ8H6/vcTUIjmgmC81FRwMogismDrQWYajK7k2+JX0k?= =?us-ascii?Q?d7ms1BgaMMriSAJtvKbzbarz?= 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 --- 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; -- 2.25.1