From patchwork Mon Jun 20 16:36:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1645594 X-Patchwork-Delegate: monstr@monstr.eu 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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=P8DEaH0b; 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LRb180pk0z9sFx for ; Tue, 21 Jun 2022 02:38:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C49B9820FC; Mon, 20 Jun 2022 18:37:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="P8DEaH0b"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 07AA382102; Mon, 20 Jun 2022 18:37:21 +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=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe05::61c]) (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 24EB4820E8 for ; Mon, 20 Jun 2022 18:37:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BCyElQSEfA22wFITzm9uNI2km1rOt55eKzzIZ5gBJPQyEyGyyKqKf4NCDQ25KbK8a5n+sD04iimKWFZizy/qrOgu5k90dQ7rZkGjWKE5DO+IZRWJsLiB6Qm3bTbFscddaPTiHm0oL8bgYXIjJVruAA2qC48wnouNp+D80l2j1zG47Mix4zzs3zEKS50/BsfBFiTq/VXPI5cngVXvXgLbuXWr2GrBaHOJ64SN5nlLOMblO2WyeLwmXx5TCCsByc8Y/YNxSLxHTUiES/NCx/qQbR6R8DZVxEERzXHd7Yt24cWmP+RRQM8LY4CF0FVXyx+Otkiyr91PkGkR1uTYm87umw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sIjfSf3i7CuR5iiDqhSXtkqtmJkMVSBBXp0hRY5WjFU=; b=c7j5J0p7hOP1SlmR0EJZMLwiMQCSgncYpAp8fQ3zqU+4FV/853dPGRmVT/zDSLLGIRn/7Z8TIVKWJSQONdF+oRFPsA7vtDMaHwS4twV/uYXGn44XW9cNycUuvjFmJ0jqmy6YYqa2IzBeIhJ+RiXP5IVe/S4eIEv7eiOYcu3O/KHmPMSLMGBJicGVSfjXFrLWt3nS7bFq6/qTcADF16yNvgDfYOtTlwJO/+6Bt6uvveHF7GfNFSzhg6YmHqbs1oxnw6Je+2Lmc2KRN69BTae7wuQ/zceLIhPfBuLATtQokygP3ZS7/V42LZd/eIJTtR5zAh1f7II/KiwOtwFAHa5h1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sIjfSf3i7CuR5iiDqhSXtkqtmJkMVSBBXp0hRY5WjFU=; b=P8DEaH0b8tch0i5mRQH9b48x0t2Rt4FvP6vMYKTgN43CFExxFyvtoWjyaE9C+Y1Tvmy1IQQ96KFtAC3qPjZije4F5K4ytO7nzTX9IhvelE5Foz1/fZGED9E/Ad6xbvp/uUZwRsJNGPLL+/M62h6J7l4B+Wbak0RTyFTaIOrT+rE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by DU0PR08MB8114.eurprd08.prod.outlook.com (2603:10a6:10:3ea::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Mon, 20 Jun 2022 16:37:15 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::49a6:e5ff:7f94:8787]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::49a6:e5ff:7f94:8787%7]) with mapi id 15.20.5353.022; Mon, 20 Jun 2022 16:37:15 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de, Michal Simek Cc: Stefan Herbrechtsmeier Subject: [PATCH v2 03/15] xilinx: zynqmp: Replace strncat with strlcat Date: Mon, 20 Jun 2022 18:36:38 +0200 Message-Id: <20220620163650.18756-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220620163650.18756-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220620163650.18756-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0560.eurprd06.prod.outlook.com (2603:10a6:20b:485::10) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 87ca38d8-e128-4934-4535-08da52db21fe X-MS-TrafficTypeDiagnostic: DU0PR08MB8114:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QgHYyCHexKqPGnoSePD2zta+wEl5Lg3lY1Uv+zdg2qDnSs4bPDOA7n5oxaG5AXArXj2ScvDk6K7Y8hpH+hgC3ET0ydhMEk5Lkahqe7VIbN0NxIfgarKzOWQAn2JSCI1KiK2TztbrITE28t4DJSkImwOEEeMXbsqF/vculrQUZgJUBFQiH3jpBDGNOwv3qmBq/3QOytjVZUVmXAWRrWiE98at1wsUm2VxTurNArJ7nqHL07XkFWCRfYBfm7JCYQHg/sHekmZCmL29JlZiCufo1dhDbq9WNq+QNsvnEw5qeF+5CsQlvImjSKp4YBzoqvr8a5Bofvn8hul9QwAtxWu9WUZgq31aIxLxi//AKbYRasyVNKLiAbBI1MZ/B614mYjTXOqUJczvFE4U9/zh9ZrRinU6gK5UODLbwtSkZqvd6gE6jSqo18+OcYtpQ8giMbL/jkwBoKJQvHSp7DTtPi0qMjc1YoqB0VVmm3ClKARcZJG2ifi99hmM2/EIgfrn4JvtTTP+f+H/7Eyn+AbIu5w5DHbLxrSMrmuaYVzky3bpBxdEq1cW/oUB+chxU1ynk807MauKniuBZq/8hIiHnNEQ94MxSF7StBCaszq7lO+80KuDPWMRAdhXVnSC6E65YVVoR9GaeC8yGhzUHGC0fWIZghQPcNHVLR7XJ73LF+SZEfzYZbr4tBd/90wTPASNVInMWhGyCt+iUFbhi3xTFsOsSw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(396003)(366004)(346002)(376002)(39860400002)(136003)(6486002)(316002)(5660300002)(8936002)(2616005)(26005)(86362001)(38100700002)(38350700002)(6512007)(478600001)(107886003)(8676002)(6506007)(6666004)(1076003)(66476007)(66946007)(41300700001)(186003)(4326008)(66556008)(83380400001)(52116002)(36756003)(2906002)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Hdh17uFw9unPZ3bx24s4SE+wge65kW0iPP97FBsnGOypNLfWZi5wWX67+01XAyylesVS3dSdiok+XMLnRV8LTcZB6lklPH6dFd7tOKcpIm9YI8JS3KmkG3HIQ9Np19vb468s5yWtX8YBQSeyk2pswbyPTdiC9iUIvuiOcwdARDtv+puZga8DtEPfIr+buRjGcX5v3t0ZBoOw6pHyjmIhdQ0OF12nnxrnzk+J5FkBfjns09pilrVkXUbQbllCVOHHTXT5/Jxyk4DZ9WD7mivjzOa7t9G+jdEM/mcS1coMp+h28YgQtvA+2ArZwXLO7bvQtjaA7ANU0bit1tNeAPFaXfG7tNZVgRDcLiPiiUsEejogLjWXW9okQhmMyhNfEwlKM25F2QkH6LneiOGxvsAmcPlKpR+Pstc/GCNMWDmf65mROhaLTfoPj8rgXPfk+hh195OiQYHrQbdxIxgIMjK5S7g6LZRyWbHpu2fEln5aQuQ734/b7zTBLLqxluqd1VztUWKHEd2QW9rUZH77OHE6otYWNpj2kM5X9PeKXparDw7tRFIDQfL0qCDn23z/qIetLNnQOsbAP0bueoRdWh3h+6RaXsBS4YWw+842SmOpywNJBILc95V8xGjybCaSAQ1mGxkIZRXv1nYdP4eMAP5No4F82jb/LGr5hdbP1pGLmoBrEIgRmMQKDM30CX72pFcWgsLAnE51LbqdMTbz88djEbTr4/wd+dAOSz62rZpbcS+kjiR2/bvKymRbu7g/zr4fClmL/wUUIF9VWIJqoykMh5aYfmP3eusLk2CMVjci3XzYsYpvBexM6TQsqLaj5hQfq+rtOOp0fdmaOOueJ5/K71F2sd8Se3Hx6/n70kVxUIqaaizEHVq+UPUYlso/Rc/kySNcePpvsiQ7mLodPpXUkcBxwl/QQ/xC089uQbEupl4N7aLRIwj/C7N7tFA3CH33oxumKY3R4DNxewoNokQUaN/3vihdoBqsl0HoFCSBbnT7ujMbZgnk20+sXdDNtvQeZmVcDxRCDpUgISku712A+vrpF22tZ4qR0w4KjP/DSr6b/21XYxv0Rq6ISHvgq3k1mZbneVuotLhCFiNALMtufFl+EVR4hOfbgbzO1dnUHb2KuwXSPhnjlBs9Lj5BTmALTPcdJpQ7NA6PA8ze+LEKHfHIu2PGTXfaIJbh/T7Ii5A6Zlbc0CE0IMYo7o65Wwlx5+rrE5B0rt1O+HqyHWn6ebWPJCFm/kFYJIYelt3lR6NBZkOS6abKJX559BUFXCNi2mGmYdWwOeKmCRaqa377+OkltzWgNXbL7iFzxrOPmqiFZv+pKVGb+4Q+0IqD6DhTnmdTES2GErvxxCDglQ191gvsIp9R/IaeeAgghLH10KB+I1/JXprbgnbxdBvekuG1K+RqQ2PvABA7Ul/D9Qxs6fWKqM+gVenpLw0yMfXSQCnd9Pe6DSsEvYuGcI6fxRvi1Jjph5mCtntyEsTozDoQkpmLFw8K5aMdco/8ls23zzybQwyrPskGImD1R6p9wB2WvfvSQGTFdUQDPYUf8F2SOvudkinzhmgzVQH71ypa+/VXkuDRblLqE/WJQ/GRZJKweaU7iHdok6g1dl6dhmP9SUgh3GX/qYhgYHRcXNqRE0UhI/OXgtLpf+2EmqpIolOoivRk3Rk4XefdJoaxNACrzk3snUmgQJdpP1L/3le2oZC8+Pw+1MoQnyHCrdIsvG85Cwt3IsplMqMXNsw9SB1UWeQCsXq/eRan5CdCY01IznE= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87ca38d8-e128-4934-4535-08da52db21fe X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2022 16:37:14.9691 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NvwkJiJbS66NQOPzkVbx/T/V/KhpqCsoKeug8sdBUfu24goe9DYqptY8icHvwxj0WiM2yKDla6wU+bKOFzvYyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8114 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.6 at phobos.denx.de X-Virus-Status: Clean From: Stefan Herbrechtsmeier Replace strncat with strlcat to always produce a valid null-terminated string. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v2: - New commit board/xilinx/zynqmp/zynqmp.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index e311aa772c..9dfa4643fb 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -282,13 +282,13 @@ static char *zynqmp_get_silicon_idcode_name(void) */ switch (family) { case 0x00: - strncat(name, "ev", 2); + strlcat(name, "ev", sizeof(name)); break; case 0x10: - strncat(name, "eg", 2); + strlcat(name, "eg", sizeof(name)); break; case 0x11: - strncat(name, "cg", 2); + strlcat(name, "cg", sizeof(name)); break; default: /* Do not append family name*/ @@ -300,16 +300,17 @@ static char *zynqmp_get_silicon_idcode_name(void) * read. So, ignore the bit and just findout if it is CG * or EG/EV variant. */ - strncat(name, (idcode2 & EFUSE_GPU_DIS_MASK) ? "cg" : - "e", 2); + strlcat(name, (idcode2 & EFUSE_GPU_DIS_MASK) ? "cg" : + "e", sizeof(name)); } } else if (zynqmp_devices[i].variants & ZYNQMP_VARIANT_CG) { /* Devices with CG variant might be EG or CG family */ - strncat(name, (idcode2 & EFUSE_GPU_DIS_MASK) ? "cg" : "eg", 2); + strlcat(name, (idcode2 & EFUSE_GPU_DIS_MASK) ? "cg" : "eg", + sizeof(name)); } else if (zynqmp_devices[i].variants & ZYNQMP_VARIANT_EG) { - strncat(name, "eg", 2); + strlcat(name, "eg", sizeof(name)); } else if (zynqmp_devices[i].variants & ZYNQMP_VARIANT_DR) { - strncat(name, "dr", 2); + strlcat(name, "dr", sizeof(name)); } else { debug("Variant not identified\n"); }