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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 570E9C00140 for ; Thu, 18 Aug 2022 21:06:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241086AbiHRVGD (ORCPT ); Thu, 18 Aug 2022 17:06:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346469AbiHRVFK (ORCPT ); Thu, 18 Aug 2022 17:05:10 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEA49D9D46 for ; Thu, 18 Aug 2022 14:02:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=k1; bh=MFKXE/fmtSH1Vsyi1kzF9noPaUK g1Bf4elnNlSsgHfQ=; b=b2Fa0YJrqlY0DnOaOUc0s3bJpbiD3EnWDFf7rTL7DJF jY0bA21koq/mmfNTcXMttPgMytgDOgv43x4R0x0Pc8Xem6inpR2gMliu26nIu0/8 3QZrDtRa1ySb0xRKg8DN0snC4JHExuV0MaBcy6bksKc2Prh393amsBs3eISr+EHI = Received: (qmail 3961048 invoked from network); 18 Aug 2022 23:00:54 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 18 Aug 2022 23:00:54 +0200 X-UD-Smtp-Session: l3s3148p1@zNP5Rormc7cucref From: Wolfram Sang To: linux-kernel@vger.kernel.org Cc: Wolfram Sang , Rob Herring , Frank Rowand , devicetree@vger.kernel.org Subject: [PATCH] of: move from strlcpy with unused retval to strscpy Date: Thu, 18 Aug 2022 23:00:53 +0200 Message-Id: <20220818210054.7157-1-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Follow the advice of the below link and prefer 'strscpy' in this subsystem. Conversion is 1:1 because the return value is not used. Generated by a coccinelle script. Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/ Signed-off-by: Wolfram Sang --- drivers/of/base.c | 2 +- drivers/of/fdt.c | 6 +++--- drivers/of/unittest.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 7fa960bd3df1..99cee6b02297 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1228,7 +1228,7 @@ int of_modalias_node(struct device_node *node, char *modalias, int len) if (!compatible || strlen(compatible) > cplen) return -ENODEV; p = strchr(compatible, ','); - strlcpy(modalias, p ? p + 1 : compatible, len); + strscpy(modalias, p ? p + 1 : compatible, len); return 0; } EXPORT_SYMBOL_GPL(of_modalias_node); diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 7bc92923104c..1617a31ecd22 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1178,7 +1178,7 @@ int __init early_init_dt_scan_chosen(char *cmdline) /* Retrieve command line */ p = of_get_flat_dt_prop(node, "bootargs", &l); if (p != NULL && l > 0) - strlcpy(cmdline, p, min(l, COMMAND_LINE_SIZE)); + strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE)); /* * CONFIG_CMDLINE is meant to be a default in case nothing else @@ -1190,11 +1190,11 @@ int __init early_init_dt_scan_chosen(char *cmdline) strlcat(cmdline, " ", COMMAND_LINE_SIZE); strlcat(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); #elif defined(CONFIG_CMDLINE_FORCE) - strlcpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); + strscpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); #else /* No arguments from boot loader, use kernel's cmdl*/ if (!((char *)cmdline)[0]) - strlcpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); + strscpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); #endif #endif /* CONFIG_CMDLINE */ diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index eafa8ffefbd0..6fa14b77086a 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -2465,7 +2465,7 @@ static int unittest_i2c_bus_probe(struct platform_device *pdev) adap = &std->adap; i2c_set_adapdata(adap, std); adap->nr = -1; - strlcpy(adap->name, pdev->name, sizeof(adap->name)); + strscpy(adap->name, pdev->name, sizeof(adap->name)); adap->class = I2C_CLASS_DEPRECATED; adap->algo = &unittest_i2c_algo; adap->dev.parent = dev; -- 2.35.1