From nobody Mon Jun 30 13:57:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bW75L3L7qz60VnD; Mon, 30 Jun 2025 13:57:26 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bW75L2Zvhz40XY; Mon, 30 Jun 2025 13:57:26 +0000 (UTC) (envelope-from avg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751291846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=CreMp2hLkcWV4wBcwp//UVVPGEClt/M7lU6SXQlnRRQ=; b=k01RXT69jWJpfQvf6ky0Da7xsM8pwttamSJus2NIM+h2Y1k/rmcMlW5/TT5tT2KuySE/3z afj2eVG4CqXw8lKYz+6w7GJxNAxZoievgFQ1LeIcoABJjBAkWIzoxCt2mXUqLQR/ssBzHO BrTM0ZpbWwszqjrSgJxF23IyCJ1bJ7gTINe6hHd2sm59byytDe3yYid3U6Sr1XQ2r9DHbc d98h2AXFluYmn8rqj5tXJ+uS1cbBzenIvXE/GxGU/YFSp0iO/2seJG3Pr1npSBUBihkMNX cqQGJtoUYmAT2SookIwp4vRl9lQz2GSL2ELLS7AaCRbGbKAlqGLYnHydlbax2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751291846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=CreMp2hLkcWV4wBcwp//UVVPGEClt/M7lU6SXQlnRRQ=; b=yjM/TsQ17o0JcwkEzADT7PuhYsdeCL7HJMbKEMiIN8up3AXdTp1+RCaa1RcEIrDpSDccwn bUulrpSXtJuCduk/WOHxmvvvCtG2A2okge0c3ZgYaDyydwLAgI5K7dASrLp6SEUuYLuAJg +g/sRN63OectLM5T8SEfi2AhV7BrCuOxMRrQRdcBR9qPhtwQAnb+nrb21OHBKLnKldv8/X pQVelA8ygJWDHVFxE/DuVxKClku5uzq1ZYWiZgPygx90A+9zhX1IUcbUCK3CRTfOsppX83 yNf2btG6SmAs4HUwlHJNL7GCtBfOqZ+seMmFL3Mvsqn9cM7W4jjmXQ+6yp6sqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751291846; a=rsa-sha256; cv=none; b=pXYK3fORoMJqmfQ16ZPVAhSaLON4NiKOC5F+kV0tx7tcFiN/eDLq4jQ9uydJTpB9kwrC/b BgcYvYDQKID+v20gQhNCjVqgoUtO3ffZq1jUQyxny9RVTRqP23CWtoUMR3Yw5FTldnbR6H t7US4/75LAh+emJtM4ROxYxRpwA6Ra+27KVbECISv9xh/g28xfGTxZTpalhatN2OF5S8Qb UQeQQ2EuEWTwazGZR1zLG3TS0Y4u47nQJFWnJ6ZsQtbbLF8c0vnUM78ZIJliN6kLM88wM8 TcNl2ePOX0qJBdOUVXcr45RqsMqNDGUplDmWSooKnfZDZS5LZyLTwAc4INll5w== Received: from [192.168.0.88] (unknown [93.188.39.137]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: avg/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bW75K40rFzRXB; Mon, 30 Jun 2025 13:57:25 +0000 (UTC) (envelope-from avg@FreeBSD.org) Message-ID: <89e23d9e-885c-4811-886a-6c1011715679@FreeBSD.org> Date: Mon, 30 Jun 2025 16:57:20 +0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Andriy Gapon Subject: Re: git: ad8d33679999 - main - mmc_xpt: use strlcpy instead of strncpy To: John Baldwin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202506270721.55R7LlB1067221@gitrepo.freebsd.org> <69858708-8e73-4b70-9f33-5176fceb1b36@FreeBSD.org> Content-Language: en-US Autocrypt: addr=avg@FreeBSD.org; keydata= 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 gpPTjT15L8xGftEjQXF6 In-Reply-To: <69858708-8e73-4b70-9f33-5176fceb1b36@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 30/06/2025 16:34, John Baldwin wrote: > On 6/27/25 03:21, Andriy Gapon wrote: >> The branch main has been updated by avg: >> >> URL: https://cgit.FreeBSD.org/src/commit/? >> id=ad8d33679999c0e7f6fd2b77d2e414102bd365ec >> >> commit ad8d33679999c0e7f6fd2b77d2e414102bd365ec >> Author:     Andriy Gapon >> AuthorDate: 2025-06-23 21:31:04 +0000 >> Commit:     Andriy Gapon >> CommitDate: 2025-06-27 07:13:34 +0000 >> >>      mmc_xpt: use strlcpy instead of strncpy >>      A better practice in general. >>      MFC after:      1 week >> --- >>   sys/cam/mmc/mmc_xpt.c | 6 +++--- >>   1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c >> index 138f96eaaa49..4fce03004994 100644 >> --- a/sys/cam/mmc/mmc_xpt.c >> +++ b/sys/cam/mmc/mmc_xpt.c >> @@ -1213,9 +1213,9 @@ mmc_path_inq(struct ccb_pathinq *cpi, const char *hba, >>       cpi->max_lun = 0; >>       cpi->initiator_id = 1; >>       cpi->maxio = maxio; >> -    strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); >> -    strncpy(cpi->hba_vid, hba, HBA_IDLEN); >> -    strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN); >> +    strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); >> +    strlcpy(cpi->hba_vid, hba, HBA_IDLEN); >> +    strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN); >>       cpi->unit_number = cam_sim_unit(sim); >>       cpi->bus_id = cam_sim_bus(sim); >>       cpi->protocol = PROTO_MMCSD; > > Hmm, are you sure these aren't depending on strncpy zero-padding > the result out to the full length?  String fields in inquiry/identity > structures are often not C strings but have other requirements. > (Some of them are space padded instead of \0 padded for example.) Not sure, but using sim_vid as an example, I see strlcpy in cam_xpt and ctl_frontend_cam_sim. It seems that in context of ccb_pathinq those fields are "normal" C strings. -- Andriy Gapon