lib/{nolibc,isrlib}: Modify pointer comparison

This commit typecasts `src` and `dst` strings from `memmove()` to ensure
that their values are treated as pointers.

It also modifies the function implementation to handle overlapping.

Co-authored-by: Soumya Ranjan <ranjan42069@gmail.com>
Signed-off-by: Maria Sfiraiala <maria.sfiraiala@gmail.com>
Signed-off-by: Soumya Ranjan <ranjan42069@gmail.com>
Reviewed-by: Radu Nichita <radunichita99@gmail.com>
Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #880

diff --git a/lib/isrlib/string.c b/lib/isrlib/string.c
index d599294506449fbcf729e24b1fcc387ccf5c0b59..a76aaf73288226b0ac95419de9cc2b255c0ccee4 100644 (file)
--- a/lib/isrlib/string.c
+++ b/lib/isrlib/string.c
@@ -110,7 +110,9 @@ void *memmove_isr(void *dst, const void *src, size_t len)
        uint8_t *d = dst;
        const uint8_t *s = src;
 
-       if (src > dst) {
+       if ((intptr_t)src == (intptr_t)dst) {
+               return dst;
+       } else if ((intptr_t)src > (intptr_t)dst) {
                for (; len > 0; --len)
                        *(d++) = *(s++);
        } else {

diff --git a/lib/nolibc/string.c b/lib/nolibc/string.c
index eacfbe8c72218eac9058d73b9a5e50f16f4a43d2..50023875fe939178003eaff7e8f820409f2aba34 100644 (file)
--- a/lib/nolibc/string.c
+++ b/lib/nolibc/string.c
@@ -110,7 +110,9 @@ void *memmove(void *dst, const void *src, size_t len)
        uint8_t *d = dst;
        const uint8_t *s = src;
 
-       if (src > dst) {
+       if ((intptr_t)src == (intptr_t)dst) {
+               return dst;
+       } else if ((intptr_t)src > (intptr_t)dst) {
                for (; len > 0; --len)
                        *(d++) = *(s++);
        } else {