From nobody Fri Apr 10 21:56:15 2026 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 B27F6C00140 for ; Thu, 18 Aug 2022 21:12:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346909AbiHRVL5 (ORCPT ); Thu, 18 Aug 2022 17:11:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346699AbiHRVKP (ORCPT ); Thu, 18 Aug 2022 17:10:15 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 480FFD87FB for ; Thu, 18 Aug 2022 14:04:57 -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=M4aFyG3QuRzq3O2VAFjURcquw6w t4Eg6up+jJzft55o=; b=zShzxvydNE99wRkMin3DH7DRSpzhYXDBxVtlXcbNhBz DHNI8XGNfJy3KJqt7jsp4Ix75W4/UQiZbTQ672dnirzir10UxYtI9VCTkPuLOuIj 314p38z1mxblCacPbxrItsLeOARfw77QX241THD+cidG0Yo1/eOxuGZffLjm3CkY = Received: (qmail 3962495 invoked from network); 18 Aug 2022 23:01:51 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 18 Aug 2022 23:01:51 +0200 X-UD-Smtp-Session: l3s3148p1@e21eSormJLUucref From: Wolfram Sang To: linux-kernel@vger.kernel.org Cc: Wolfram Sang , Mark Fasheh , Joel Becker , Joseph Qi , ocfs2-devel@oss.oracle.com Subject: [PATCH] ocfs2: move from strlcpy with unused retval to strscpy Date: Thu, 18 Aug 2022 23:01:50 +0200 Message-Id: <20220818210151.8035-1-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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-=3DwgfRnXz0W3D37d01q3JFkr_i_uTL=3DV6A6= G1oUZcprmknw@mail.gmail.com/ Signed-off-by: Wolfram Sang --- fs/ocfs2/stackglue.c | 4 ++-- fs/ocfs2/super.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c index dd77b7aaabf5..317126261523 100644 --- a/fs/ocfs2/stackglue.c +++ b/fs/ocfs2/stackglue.c @@ -334,10 +334,10 @@ int ocfs2_cluster_connect(const char *stack_name, goto out; } =20 - strlcpy(new_conn->cc_name, group, GROUP_NAME_MAX + 1); + strscpy(new_conn->cc_name, group, GROUP_NAME_MAX + 1); new_conn->cc_namelen =3D grouplen; if (cluster_name_len) - strlcpy(new_conn->cc_cluster_name, cluster_name, + strscpy(new_conn->cc_cluster_name, cluster_name, CLUSTER_NAME_MAX + 1); new_conn->cc_cluster_name_len =3D cluster_name_len; new_conn->cc_recovery_handler =3D recovery_handler; diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 013a727bd7c8..ec46489b6c7e 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -2222,7 +2222,7 @@ static int ocfs2_initialize_super(struct super_block = *sb, goto out_journal; } =20 - strlcpy(osb->vol_label, di->id2.i_super.s_label, + strscpy(osb->vol_label, di->id2.i_super.s_label, OCFS2_MAX_VOL_LABEL_LEN); osb->root_blkno =3D le64_to_cpu(di->id2.i_super.s_root_blkno); osb->system_dir_blkno =3D le64_to_cpu(di->id2.i_super.s_system_dir_blkno); --=20 2.35.1