Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Feb 2025 15:39:09 GMT
From:      Zhenlei Huang <zlei@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 90a3b6a7a4e4 - main - libkern: strdup.c, strndup.c: Prefer memcpy() over bcopy()
Message-ID:  <202502171539.51HFd9wT070308@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by zlei:

URL: https://cgit.FreeBSD.org/src/commit/?id=90a3b6a7a4e4c8201ba1bb90fb8e2b088f3a5788

commit 90a3b6a7a4e4c8201ba1bb90fb8e2b088f3a5788
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2025-02-17 15:37:59 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2025-02-17 15:37:59 +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
---
 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 4f7b62a3941d..de56ce67db72 100644
--- a/sys/libkern/strdup.c
+++ b/sys/libkern/strdup.c
@@ -46,7 +46,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 2d71f2463242..75b33339e1c7 100644
--- a/sys/libkern/strndup.c
+++ b/sys/libkern/strndup.c
@@ -42,7 +42,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);
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502171539.51HFd9wT070308>