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 DD9E1C433EF for ; Mon, 27 Sep 2021 11:25:01 +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 5B65A60EFD for ; Mon, 27 Sep 2021 11:25:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5B65A60EFD 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 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) 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> 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: 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: =?us-ascii?Q?41gSy8+QUtggL2mRMhWKuCp7D21fadlqAG7Mol515bxhZsts19wniletlFq8?= =?us-ascii?Q?lNui9APz3ocFdGjFES7uP01qJVJZ4pKetbo2K8rQmAsquhQzpEMkySrzpsDL?= =?us-ascii?Q?DT8GJw0RMxB0HiuOT8s7OMH3OtVye2Y7EKqEFdRdlXkv7PClrT6rfyEP/OTU?= =?us-ascii?Q?ZiOSX1FnkgjFP5nYis7XiOGtkkH2WBcMWfhvyJ4Vyh4ppYZAvGvP12770e69?= =?us-ascii?Q?4ovLLkQ6pezSr3jo3B9EmrkOQ5ZGNWR9gHCqhYlDeQiHxr/mchyFaIyunEwP?= =?us-ascii?Q?wQuq/4ys17EPPmk6FbUDRJwhu7aH33VRRRFKa1TMxRcSGHnGW5rEVvVBTSGW?= =?us-ascii?Q?LR48111134b5LsVFDN5HhUclGkkYyNIcpElyQ0w/ko3aKf6/rxgtvjIU5B4U?= =?us-ascii?Q?kihQRf3Dy28YPu5llyyKVsco2AZZP2ObDeOu7WTfpKCbcq4kLGbnQw/m9UWo?= =?us-ascii?Q?qL2T40g2Gu4IPA/zglBanOTNqX4O7sPRg5pt44NVswOaFRrVvccidqW9Lq5r?= =?us-ascii?Q?cM2AK+6Pj2Mqygyj3pQrxZ99A9d2ot0ioKrey1sWPhMxj1OXwH7YDFSJ7HWH?= =?us-ascii?Q?qLtuy06oE5L5BAddL7SuXTfKOvbxQojBBdpfOHEp+0cIRYUTE6yJOGnqu732?= =?us-ascii?Q?Xfl1m/ipEFO7hG03eD3j4mMYoJMYlVos6fakijDa7Mgk6Y/p0qbInDjKbJF9?= =?us-ascii?Q?U/jzb7dJ4uxsRklxI7GwNmvw+8JVAMR4xmkZxv1g3l25YteszbbsXLD9CT1n?= =?us-ascii?Q?r2uLbyvO92bPUwORQkBgpFanePInGcYo5Lsrkz9aP6y8q80PEiS20Ff6EBzR?= =?us-ascii?Q?fIp8iQGX0kJocLa5UtkJ3kexyeix0PlzyY2QtE2fWrIAAgB+MjfDNg+6xS68?= =?us-ascii?Q?LsmHtFGuLDDqWUX7qr9bnTHAlV5pQ42OlBvMqeakHneA6sltD2jlOXjWvd5I?= =?us-ascii?Q?iq7NMhl79SSh2RV5sANJHMrkMNeOFDixDIWmQCzNEPZO1Vrf/uwvjtwG9OdZ?= =?us-ascii?Q?ZeW47V54Rzexi/V8x1i8lNoZiVv69n7VEydEmLv9yrwIXnuke0PYJFHd+Umo?= =?us-ascii?Q?ibUIItzBxack2foR33eJKDanKuqbyhZJnZiPIuhH37i+oqdfwSAegFmHqXdW?= =?us-ascii?Q?zZf+1lpIAudYyi1+RPD0QKaVBeUipNTrArh9augtGNx7CasrzrYlHwW7IGYt?= =?us-ascii?Q?+grFVvDE7YiWRAw/+lL4GkXEuNotXQnsTjDO97bWhxiVpsWsVScHe6SwNc/8?= =?us-ascii?Q?FVvP5xRBXT/ljYHJahX/wOgiwDZShjwvmHf/7YonU7bPpYxOW0BR332CJeU5?= =?us-ascii?Q?c3L7MhRdjbFlLk86cXNe9YWn?= 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 --- 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; -- 2.25.1