OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

memcpy_s: fix the name of the last parameter 

The last parameter of memcpy_s() isn't the size of the source buffer,
it's the actual number of bytes that should be copied.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2022-12-21 12:34:01 +01:00 committed by Liam Girdwood
parent 46a5d623f6
commit 12a553814b
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/arch/host/include/arch/string.h
View File

@ -25,25 +25,25 @@ void *memset(void *dest, int data, size_t count);
int memset_s(void *dest, size_t dest_size, int memset_s(void *dest, size_t dest_size,
int data, size_t count); int data, size_t count);
int memcpy_s(void *dest, size_t dest_size, int memcpy_s(void *dest, size_t dest_size,
const void *src, size_t src_size); const void *src, size_t count);
void *__vec_memcpy(void *dst, const void *src, size_t len); void *__vec_memcpy(void *dst, const void *src, size_t len);
void *__vec_memset(void *dest, int data, size_t src_size); void *__vec_memset(void *dest, int data, size_t src_size);
static inline int arch_memcpy_s(void *dest, size_t dest_size, static inline int arch_memcpy_s(void *dest, size_t dest_size,
const void *src, size_t src_size) const void *src, size_t count)
{ {
if (!dest || !src) if (!dest || !src)
return -EINVAL; return -EINVAL;
if ((dest >= src && (char *)dest < ((char *)src + src_size)) || if ((dest >= src && (char *)dest < ((char *)src + count)) ||
(src >= dest && (char *)src < ((char *)dest + dest_size))) (src >= dest && (char *)src < ((char *)dest + dest_size)))
return -EINVAL; return -EINVAL;
if (src_size > dest_size) if (count > dest_size)
return -EINVAL; return -EINVAL;
memcpy(dest, src, src_size); memcpy(dest, src, count);
return 0; return 0;
} }

12
src/arch/xtensa/include/arch/string.h
View File

@ -26,28 +26,28 @@ void *xthal_memcpy(void *dst, const void *src, size_t len);
int memset_s(void *dest, size_t dest_size, int memset_s(void *dest, size_t dest_size,
int data, size_t count); int data, size_t count);
int memcpy_s(void *dest, size_t dest_size, int memcpy_s(void *dest, size_t dest_size,
const void *src, size_t src_size); const void *src, size_t count);
void *__vec_memcpy(void *dst, const void *src, size_t len); void *__vec_memcpy(void *dst, const void *src, size_t len);
void *__vec_memset(void *dest, int data, size_t src_size); void *__vec_memset(void *dest, int data, size_t src_size);
static inline int arch_memcpy_s(void *dest, size_t dest_size, static inline int arch_memcpy_s(void *dest, size_t dest_size,
const void *src, size_t src_size) const void *src, size_t count)
{ {
if (!dest || !src) if (!dest || !src)
return -EINVAL; return -EINVAL;
if ((dest >= src && (char *)dest < ((char *)src + src_size)) || if ((dest >= src && (char *)dest < ((char *)src + count)) ||
(src >= dest && (char *)src < ((char *)dest + dest_size))) (src >= dest && (char *)src < ((char *)dest + dest_size)))
return -EINVAL; return -EINVAL;
if (src_size > dest_size) if (count > dest_size)
return -EINVAL; return -EINVAL;
#if __XCC__ && XCHAL_HAVE_HIFI3 && !CONFIG_LIBRARY #if __XCC__ && XCHAL_HAVE_HIFI3 && !CONFIG_LIBRARY
__vec_memcpy(dest, src, src_size); __vec_memcpy(dest, src, count);
#else #else
memcpy(dest, src, src_size); memcpy(dest, src, count);
#endif #endif
return 0; return 0;

4
src/lib/lib.c
View File

@ -69,9 +69,9 @@ int memcmp(const void *p, const void *q, size_t count)
#endif #endif
int memcpy_s(void *dest, size_t dest_size, int memcpy_s(void *dest, size_t dest_size,
const void *src, size_t src_size) const void *src, size_t count)
{ {
return arch_memcpy_s(dest, dest_size, src, src_size); return arch_memcpy_s(dest, dest_size, src, count);
} }
int memset_s(void *dest, size_t dest_size, int data, size_t count) int memset_s(void *dest, size_t dest_size, int data, size_t count)

2
src/platform/intel/cavs/lps_wait.c
View File

@ -21,7 +21,7 @@
#ifdef __ZEPHYR__ #ifdef __ZEPHYR__
/* TODO: declare local copy to avoid naming collisions with Zephyr and SOF */ /* TODO: declare local copy to avoid naming collisions with Zephyr and SOF */
/* headers until common functions can be separated out */ /* headers until common functions can be separated out */
int memcpy_s(void *dest, size_t dest_size, const void *src, size_t src_size); int memcpy_s(void *dest, size_t dest_size, const void *src, size_t count);
#endif #endif
#define LPSRAM_MAGIC_VALUE 0x13579BDF #define LPSRAM_MAGIC_VALUE 0x13579BDF

8
test/cmocka/src/common_mocks.c
View File

@ -76,19 +76,19 @@ void WEAK rfree(void *ptr)
} }
int WEAK memcpy_s(void *dest, size_t dest_size, int WEAK memcpy_s(void *dest, size_t dest_size,
const void *src, size_t src_size) const void *src, size_t count)
{ {
if (!dest || !src) if (!dest || !src)
return -EINVAL; return -EINVAL;
if ((dest >= src && (char *)dest < ((char *)src + src_size)) || if ((dest >= src && (char *)dest < ((char *)src + count)) ||
(src >= dest && (char *)src < ((char *)dest + dest_size))) (src >= dest && (char *)src < ((char *)dest + dest_size)))
return -EINVAL; return -EINVAL;
if (src_size > dest_size) if (count > dest_size)
return -EINVAL; return -EINVAL;
memcpy(dest, src, src_size); memcpy(dest, src, count);
return 0; return 0;
} }

8
zephyr/include/rtos/string.h
View File

@ -35,19 +35,19 @@ static inline int rstrcmp(const char *s1, const char *s2)
/* C library does not have the "_s" versions used by Windows */ /* C library does not have the "_s" versions used by Windows */
static inline int memcpy_s(void *dest, size_t dest_size, static inline int memcpy_s(void *dest, size_t dest_size,
const void *src, size_t src_size) const void *src, size_t count)
{ {
if (!dest || !src) if (!dest || !src)
return -EINVAL; return -EINVAL;
if ((dest >= src && (char *)dest < ((char *)src + src_size)) || if ((dest >= src && (char *)dest < ((char *)src + count)) ||
(src >= dest && (char *)src < ((char *)dest + dest_size))) (src >= dest && (char *)src < ((char *)dest + dest_size)))
return -EINVAL; return -EINVAL;
if (src_size > dest_size) if (count > dest_size)
return -EINVAL; return -EINVAL;
memcpy(dest, src, src_size); memcpy(dest, src, count);
return 0; return 0;
} }