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 44A09ECAAD8 for ; Mon, 29 Aug 2022 21:32:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229549AbiH2Vce (ORCPT ); Mon, 29 Aug 2022 17:32:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229710AbiH2VcW (ORCPT ); Mon, 29 Aug 2022 17:32:22 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A070BDB; Mon, 29 Aug 2022 14:32:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 829E6CE13FE; Mon, 29 Aug 2022 21:32:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DA44C433C1; Mon, 29 Aug 2022 21:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661808737; bh=61pBkpLnKiA8l1OQZn1OET1WloEC2QanlgAje+br33U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=delIKnE8PDy1j3+uwp5CA9aZELDd0zRelaP76+LN5ZTFbguWTyIslqP0JZlpsqTR2 mM6KQmICgUn+qIinjoE9thZV8YBnUtV2NhD+9ysH+nsHGi13AG30T57158D3jD+w5X Po+wC8ACtI456T+tyYM0R1eJOPOg+5oXJs/G7ERuxbxVv7tbXOi2TDSj+jWXVpzBFj mc6eIJUNC7h7eUoL96MTxSf7x5787p6Xxyw66F4/C5t00VjWs9KxIIgqduRlgf8hte OapZVuYvIeefXqqSaZDUbeYcjgEPuhX+zYKJ3fjCnuV4c6KANccjnHSn7CTkuwP60P EtrkxIwCAT/XA== Date: Mon, 29 Aug 2022 16:32:15 -0500 From: Bjorn Andersson To: Wolfram Sang , Qiang Zhao , Li Yang Cc: linux-kernel@vger.kernel.org, Andy Gross , Bjorn Andersson , Konrad Dybcio , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: Re: [PATCH] soc: move from strlcpy with unused retval to strscpy Message-ID: <20220829213215.lw233zzbvhevaqrm@builder.lan> References: <20220818210106.7349-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220818210106.7349-1-wsa+renesas@sang-engineering.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 18, 2022 at 11:01:06PM +0200, Wolfram Sang wrote: > 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/soc/fsl/qe/qe.c | 4 ++-- Qiang, Li, would you like to merge this patch? Or could I perhaps get an Acked-by from either of you so that I could take the patch through the Qualcomm tree? If you prefer: Acked-by: Bjorn Andersson Regards, Bjorn > drivers/soc/qcom/smp2p.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/soc/fsl/qe/qe.c b/drivers/soc/fsl/qe/qe.c > index b3c226eb5292..58746e570d14 100644 > --- a/drivers/soc/fsl/qe/qe.c > +++ b/drivers/soc/fsl/qe/qe.c > @@ -524,7 +524,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware) > * saved microcode information and put in the new. > */ > memset(&qe_firmware_info, 0, sizeof(qe_firmware_info)); > - strlcpy(qe_firmware_info.id, firmware->id, sizeof(qe_firmware_info.id)); > + strscpy(qe_firmware_info.id, firmware->id, sizeof(qe_firmware_info.id)); > qe_firmware_info.extended_modes = be64_to_cpu(firmware->extended_modes); > memcpy(qe_firmware_info.vtraps, firmware->vtraps, > sizeof(firmware->vtraps)); > @@ -599,7 +599,7 @@ struct qe_firmware_info *qe_get_firmware_info(void) > /* Copy the data into qe_firmware_info*/ > sprop = of_get_property(fw, "id", NULL); > if (sprop) > - strlcpy(qe_firmware_info.id, sprop, > + strscpy(qe_firmware_info.id, sprop, > sizeof(qe_firmware_info.id)); > > of_property_read_u64(fw, "extended-modes", > diff --git a/drivers/soc/qcom/smp2p.c b/drivers/soc/qcom/smp2p.c > index d9c28a8a7cbf..e9c8030d50ee 100644 > --- a/drivers/soc/qcom/smp2p.c > +++ b/drivers/soc/qcom/smp2p.c > @@ -422,7 +422,7 @@ static int qcom_smp2p_outbound_entry(struct qcom_smp2p *smp2p, > char buf[SMP2P_MAX_ENTRY_NAME] = {}; > > /* Allocate an entry from the smem item */ > - strlcpy(buf, entry->name, SMP2P_MAX_ENTRY_NAME); > + strscpy(buf, entry->name, SMP2P_MAX_ENTRY_NAME); > memcpy(out->entries[out->valid_entries].name, buf, SMP2P_MAX_ENTRY_NAME); > > /* Make the logical entry reference the physical value */ > -- > 2.35.1 >