Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Wolfram Sang <wsa+renesas@sang-engineering.com>
CC:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Jeff Layton <jlayton@kernel.org>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH 05/14] NFSD: move from strlcpy with unused retval to
 strscpy
Thread-Topic: [PATCH 05/14] NFSD: move from strlcpy with unused retval to
 strscpy
Thread-Index: AQHYs0YZdqb1Z0ytEkGMvLQlXtg5dK21Jt2A
Date:   Thu, 18 Aug 2022 21:08:48 +0000
Message-ID: <45B86549-7FA6-4E09-9739-4756FBD830BC@oracle.com>
References: <20220818210123.7637-1-wsa+renesas@sang-engineering.com>
 <20220818210123.7637-5-wsa+renesas@sang-engineering.com>
In-Reply-To: <20220818210123.7637-5-wsa+renesas@sang-engineering.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?jxc3DvKbuXsDN6ziCynLO0fnDLwbX6mVX7ylcaZ5q9IUItsF00CA5BkUtak4?=
 =?us-ascii?Q?1Zrd2wjMbcQ7SODC8k14e7vedt+KnOdFr3jqkql4yPdRhs92nhiUnFpq7/WG?=
 =?us-ascii?Q?EgcdmootXPnXK46TDWeKH34xH7Sh9CMFw8LHTDJDWqcab6VnEE0Kv2FnbJqI?=
 =?us-ascii?Q?Bmfau05F+lKBKU+vwYRreD6in0OhkLEJewBS9YHMm2QIdaDSeR4fSsp1lKSj?=
 =?us-ascii?Q?rxwVOhXTpmONUMltTdiBobJvd3BKrLp2CwhGpjRHyS3ejm0LvsgKynNLrBcX?=
 =?us-ascii?Q?ctMuYr5fcCRy9NA5CcaQ0C8Abp+VFcHzdSMssgGezvPIgHMIzJH4tsVIT1Lk?=
 =?us-ascii?Q?dUUogG0X7+0BUXlDMeKMOcwGSKD9zeligEqCqT20pbyEai3gknP7I1oya6aB?=
 =?us-ascii?Q?76WfFbQUgdVtpwbdv63yybpfBFZSZBi7rkbMh9QiCIuvutJUtIKslIUIAApJ?=
 =?us-ascii?Q?LNpnPvXxfcGmAARqBB1JSnMLZTj1HsJ3bTXKOfjm64bNcuzuQY1e3BpQ/THw?=
 =?us-ascii?Q?x0ErYPFo412WzUrkvQQaTEmMw3WIFMNbl2idMVrYpbZZ2lrMJfDPL/OLYoa1?=
 =?us-ascii?Q?eAm8b3Ihufzq+hBrwpT9KH/hHb00B5V44fXc8yI0Pbufs+X0lKuUHbxF1PyU?=
 =?us-ascii?Q?sw75w6d/EtTGqGG+p3E6e2gsAMFdEyPIe3IFcBfBACLUtP8sM+blfM9pcLIY?=
 =?us-ascii?Q?mZdfCV96+QoH0fnI4Ouci9avnsWNE5yMnsF3chaOtrQzoeF7OF6gAUdY1Le1?=
 =?us-ascii?Q?0HmH9g97G/6FC55zNOyi7oH5ZeAAfx+4jVD7Mle/xdSpShSd8P7bXjOxWVy2?=
 =?us-ascii?Q?f7GkOEdpvydprMNWWtzeqH2f69DIAR/8EDAbV2defpk28ucTakAdSAw0hM3r?=
 =?us-ascii?Q?mR1InT0KH0lGLHfqY2I4VKArqA7VzOkYzQuxXMXjSC5nexvqcqXSS3Q40yFA?=
 =?us-ascii?Q?xoKVDHiMsTZdsqOcvMlWbfU1JTNEVEBHzZ55+t1a/pvkaIjUS1JeoUZ/Tyx6?=
 =?us-ascii?Q?TL6s5OllrRUa2mfuA5irbbzD3y7+4q9IN9ZQXtJXo7SujDdUHanvXd0unom0?=
 =?us-ascii?Q?JTuZzlPH2EpmllYACu9BNoz2pH9giTn++I2iPAsdQww/TQY2Nu1P8K6MY2mk?=
 =?us-ascii?Q?ElhwgHyv2hwrsvy1qdOg9NWTlMf+v3L1WVRG8ndsArR5UCwLAwD9uErTfyS6?=
 =?us-ascii?Q?xg+ecyC4d+HvGBrz62jhrI8piKRz52R2b4KEDR7p2XcO8kYUuzhXR/f1x/wI?=
 =?us-ascii?Q?LJWFK2aY6+mrs1/ThNIRqGwnWUJzqovwGDior9X/JLtKH4sU+yGGYQxHPamX?=
 =?us-ascii?Q?OJ6sWaXMQAzEi3IZJdeGg7MIL7jnAtta9YtmcCKMF83besh5SpSrybq5ZCwF?=
 =?us-ascii?Q?TOazLjJolxQb1iANrChCoq9wUTyemanvKtxvBMUHGV+knzjrzDGABDd/fPnn?=
 =?us-ascii?Q?5Tt0ACSuN7ZapAvOR1BwPpVI8w5efffl8hf5K+cIRL4HtOj9WfqPmkbMIzFm?=
 =?us-ascii?Q?yKdGypOOhcz+H0nh4ltDhuHtfHVKwikUqf8RByY6cj7pX1BKj0NlhUGX+4JT?=
 =?us-ascii?Q?6etDPqRALZxRhJMXCV0/TnUjWJAZpWK4czEEqq8j2eiYq7g4G/ijpowOqsQy?=
 =?us-ascii?Q?+Q=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <7D557F1113838B4EBF1BE7B3C477428E@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?b1T4g4JG4BVJCpily0T7caDZNU0bdahf5VDNLt+7nyh4ZUgNQPHfJgOreOVr?=
 =?us-ascii?Q?xSxhmxj/rK9BRSdIa7guEBCKDwC2vRlvzVxeIbUPKYnXoazq43q8bRvfEVgI?=
 =?us-ascii?Q?QEmzpQZCwita5sn2Jx+t0eOxqqAUhUNuwx1MovrwumXXpQCRkzx3/7XWhaJC?=
 =?us-ascii?Q?TzGSuXGwESnTHTV7/UnZGh9bpXHSGvMgEnAUhRUMm9Q9ezQw6u5UICxbcQtH?=
 =?us-ascii?Q?wPDzFJc0QHDldXYGKuYZrsnBMc1eRXKaLoEqd1RVi2ctKA9cUc7LmwhP5dYh?=
 =?us-ascii?Q?oCAmd2usfYFL3i9pCW2Ooq+o9f9rKCrJfRHSDWJd2+yUwWAbmY9/0mceCocS?=
 =?us-ascii?Q?7g5nKKdt185Aww+CoofNkrEL2q+DXg/RASIJgnntDCUXPAz7aWnIbsp6oP65?=
 =?us-ascii?Q?ssuiRZv5PCTMVrx6Pj/1BqqB8IKJtmhLrwesxgxt6T2gt1xsNem4eU+JMQjS?=
 =?us-ascii?Q?0g0Xxh9Vc1OARpvseYaqHDnlgCUV/vJIOdF00/DhO8Yps4G2gEDBug9YxpIE?=
 =?us-ascii?Q?16U+gKgRt2Y40SyVA/adsrEhtlItGW1eGOgBSRhl6o3CE12Oe6QLYJVFLIuF?=
 =?us-ascii?Q?NGvBGYPCTx1eX8OSHMGrMHwtb4VqoLdEHP9bZbMMRUDwjn12MoShr5VNHXzc?=
 =?us-ascii?Q?GF8RT7PLAJRR6LEBqs1MWPoM5H7IvpY13pufgUBU39iK4HrDhNVlpCdKMyWN?=
 =?us-ascii?Q?rgptFbZhFynro8pxS34AHOdP+IE8uOTTleyj6JF4VJgucldtPSRUEO5HQfFo?=
 =?us-ascii?Q?C1jEqokED8CZXEc+k1p6pvIRniE1Y90BdPFkrZvrlEI6ZoEpxDlMKjv0+yI7?=
 =?us-ascii?Q?hG+oI66FR+2/h+n5XwBGLwX+y2fnyXukaFBGPOxHrrLq5a3iIKhSnx0bQgUy?=
 =?us-ascii?Q?+xsQdrFA8fS6VQcERrE8VjYBBkJdb+8DhVOb3fq1Udl9eauvQaE7cP5srXBb?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0749cb91-07df-4573-3ee6-08da815dd85d
X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Aug 2022 21:08:48.7652
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: ZjZLSfa2lKgTb9Ye4V3i/FTzjNGGqBTkBS+nVT8rJ0PZCIB1xO9i+hcP79AM71Yu9Gu13YyU9yo9BnN0eoGifQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1455
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-18_16,2022-08-18_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999
 phishscore=0 mlxscore=0 malwarescore=0 suspectscore=0 adultscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2207270000 definitions=main-2208180076
X-Proofpoint-GUID: IgQmZWVX6ya7RGWhlg38PgNk-wwl1B8e
X-Proofpoint-ORIG-GUID: IgQmZWVX6ya7RGWhlg38PgNk-wwl1B8e
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Aug 18, 2022, at 5:01 PM, Wolfram Sang <wsa+renesas@sang-engineering.c=
om> wrote:
>=20
> 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.
>=20
> Link: https://lore.kernel.org/r/CAHk-=3DwgfRnXz0W3D37d01q3JFkr_i_uTL=3DV6=
A6G1oUZcprmknw@mail.gmail.com/
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Makes sense.

I think I would like to carry 05 and 07 in the NFSD tree so they
can get some exposure to our test workloads before they are merged.
Is that OK with you?


> ---
> fs/nfsd/nfs4idmap.c | 8 ++++----
> fs/nfsd/nfs4proc.c  | 2 +-
> fs/nfsd/nfssvc.c    | 2 +-
> 3 files changed, 6 insertions(+), 6 deletions(-)
>=20
> diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
> index f92161ce1f97..e70a1a2999b7 100644
> --- a/fs/nfsd/nfs4idmap.c
> +++ b/fs/nfsd/nfs4idmap.c
> @@ -82,8 +82,8 @@ ent_init(struct cache_head *cnew, struct cache_head *ci=
tm)
> 	new->id =3D itm->id;
> 	new->type =3D itm->type;
>=20
> -	strlcpy(new->name, itm->name, sizeof(new->name));
> -	strlcpy(new->authname, itm->authname, sizeof(new->authname));
> +	strscpy(new->name, itm->name, sizeof(new->name));
> +	strscpy(new->authname, itm->authname, sizeof(new->authname));
> }
>=20
> static void
> @@ -548,7 +548,7 @@ idmap_name_to_id(struct svc_rqst *rqstp, int type, co=
nst char *name, u32 namelen
> 		return nfserr_badowner;
> 	memcpy(key.name, name, namelen);
> 	key.name[namelen] =3D '\0';
> -	strlcpy(key.authname, rqst_authname(rqstp), sizeof(key.authname));
> +	strscpy(key.authname, rqst_authname(rqstp), sizeof(key.authname));
> 	ret =3D idmap_lookup(rqstp, nametoid_lookup, &key, nn->nametoid_cache, &=
item);
> 	if (ret =3D=3D -ENOENT)
> 		return nfserr_badowner;
> @@ -584,7 +584,7 @@ static __be32 idmap_id_to_name(struct xdr_stream *xdr=
,
> 	int ret;
> 	struct nfsd_net *nn =3D net_generic(SVC_NET(rqstp), nfsd_net_id);
>=20
> -	strlcpy(key.authname, rqst_authname(rqstp), sizeof(key.authname));
> +	strscpy(key.authname, rqst_authname(rqstp), sizeof(key.authname));
> 	ret =3D idmap_lookup(rqstp, idtoname_lookup, &key, nn->idtoname_cache, &=
item);
> 	if (ret =3D=3D -ENOENT)
> 		return encode_ascii_id(xdr, id);
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index a72ab97f77ef..0437210b9898 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -1343,7 +1343,7 @@ static __be32 nfsd4_ssc_setup_dul(struct nfsd_net *=
nn, char *ipaddr,
> 		return 0;
> 	}
> 	if (work) {
> -		strlcpy(work->nsui_ipaddr, ipaddr, sizeof(work->nsui_ipaddr) - 1);
> +		strscpy(work->nsui_ipaddr, ipaddr, sizeof(work->nsui_ipaddr) - 1);
> 		refcount_set(&work->nsui_refcnt, 2);
> 		work->nsui_busy =3D true;
> 		list_add_tail(&work->nsui_list, &nn->nfsd_ssc_mount_list);
> diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
> index 4bb5baa17040..bfbd9f672f59 100644
> --- a/fs/nfsd/nfssvc.c
> +++ b/fs/nfsd/nfssvc.c
> @@ -799,7 +799,7 @@ nfsd_svc(int nrservs, struct net *net, const struct c=
red *cred)
> 	if (nrservs =3D=3D 0 && nn->nfsd_serv =3D=3D NULL)
> 		goto out;
>=20
> -	strlcpy(nn->nfsd_name, utsname()->nodename,
> +	strscpy(nn->nfsd_name, utsname()->nodename,
> 		sizeof(nn->nfsd_name));
>=20
> 	error =3D nfsd_create_serv(net);
> --=20
> 2.35.1
>=20

--
Chuck Lever