From nobody Mon Mar 03 14:58:05 2025 X-Original-To: dev-commits-src-branches@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 4Z624F2rDVz5pbtP; Mon, 03 Mar 2025 14:58:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z624F21dZz3p4S; Mon, 03 Mar 2025 14:58:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741013885; 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; bh=6ta1acVhpQBo77rYf/JPrm1BhUkbG/bLNl75joAInQg=; b=ZQ6ddyzrpQvxk31nZsJ8n99lU1+b1e179jgPeDq+Um9QdVlA496vJVtvibEDJrOG/hO6rx Mlp6NT7Bb1A/bR3SRlZoQnRr60X0AeoSpFfnKh9sOfG5Gkng0KN+1O+v5XhiKw0VDryVXb q9+bhDvVFn1yoJ61sbj3LEGoTAstH8MVFwcKaIL5A1bvBDj7QjqNfihcbOWbJA7HyytvDq S9mAi6gUVfRV2EdRU68Yuynw2TEZzxnWblBHIphssosHOBKu2AGz8ZgshKzJB7U7i2tz0Q stFsUttxTNxEFxoqp+RwXzfqzSbHmnUVwkCj1NjH/1io/6oFOj7Bjw/7r/aeZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741013885; a=rsa-sha256; cv=none; b=jRwprLlEQciwhfu8rRrSv4xCI3tG969s1U++Kezb00neZ0LtGNIA6qlNjXs/66h5fN/fnc WMKYKSigCRrIY0H4k7E3STEwc7mgYflT24mgBw+r3QsZsUATYeMs3gwCsoqsJgUPZBm+LW Ze7pfh6pJVtalIJd2Bdg/v3C0wzBAdc8Xw4TlCP9b+8cbp/P1PmcVnOLRRq+C4mD0yXYlk EVsXFH1PaiB8rkpfSUcYCw4j3Txt27LWj0TIhw6fTtkIJA0W0ueeS8yIL/dSULUdhBKOXL 5NpgEFthML3hL/n9YmQFtn1kJoRXLKlekIV2naVYlSuWW85ZggwypHWa4HlHLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741013885; 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; bh=6ta1acVhpQBo77rYf/JPrm1BhUkbG/bLNl75joAInQg=; b=PZ5rH3aDCgJz45Uso1zXm0e4JW5+NqJbk+3oJgNYqJTEe/5rUg5QrP0hZKRGyKoRKSpM0Z +UWbUV4OIaNiYvOhrbtTXPVjkPrj3fgOo/sOgkTkPqArFmXino647wtTIojnMAKpWc/6k6 4SRwyUttLnZGF6ala55mq+H7jdTEBJ99ujUXSXT2jEzfuUulgfpfvHk3Ok51u79dtYieIC 6y5u0ZgHccCTNU6n+1IwqRbwgtNoFE1KptBOvteunM/YTxUHH6w95MA/ecnNEvqS9D3U6H Grqh3F0ROqbWSU4Q13+PfE7I04bEryD0ex96jNs0IarOmIS75bCQffdjEE3aBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z624F1d4HzsQP; Mon, 03 Mar 2025 14:58:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 523Ew5Fj060017; Mon, 3 Mar 2025 14:58:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 523Ew5LA060014; Mon, 3 Mar 2025 14:58:05 GMT (envelope-from git) Date: Mon, 3 Mar 2025 14:58:05 GMT Message-Id: <202503031458.523Ew5LA060014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 588838aa2484 - stable/14 - libkern: strdup.c, strndup.c: Prefer memcpy() over bcopy() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 588838aa2484619c93231aedb22c24e761d244da Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=588838aa2484619c93231aedb22c24e761d244da commit 588838aa2484619c93231aedb22c24e761d244da Author: Zhenlei Huang AuthorDate: 2025-02-17 15:37:59 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-03 14:56:34 +0000 libkern: strdup.c, strndup.c: Prefer memcpy() over bcopy() The newly allocated memory can not overlap with the string if the string is properly null-terminated or the maxlen is a valid lengh, i.e no out of bounds reads. Prefer memcpy() over memmove(), aka bcopy(), for slight performance gain. No functional change intended. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49026 (cherry picked from commit 90a3b6a7a4e4c8201ba1bb90fb8e2b088f3a5788) --- sys/libkern/strdup.c | 2 +- sys/libkern/strndup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/libkern/strdup.c b/sys/libkern/strdup.c index f5685fcc554f..38f5c8f194c3 100644 --- a/sys/libkern/strdup.c +++ b/sys/libkern/strdup.c @@ -47,7 +47,7 @@ strdup_flags(const char *string, struct malloc_type *type, int flags) copy = malloc(len, type, flags); if (copy == NULL) return (NULL); - bcopy(string, copy, len); + memcpy(copy, string, len); return (copy); } diff --git a/sys/libkern/strndup.c b/sys/libkern/strndup.c index f8867c140e67..9065153d7232 100644 --- a/sys/libkern/strndup.c +++ b/sys/libkern/strndup.c @@ -43,7 +43,7 @@ strndup(const char *string, size_t maxlen, struct malloc_type *type) len = strnlen(string, maxlen) + 1; copy = malloc(len, type, M_WAITOK); - bcopy(string, copy, len); + memcpy(copy, string, len); copy[len - 1] = '\0'; return (copy); }