diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-03-29 08:38:28 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-30 09:38:25 +0100 |
commit | 97dd1b0ab5524fe9cda53f60847f3e3c07cc90a8 (patch) | |
tree | 1e3b40fdec46266c0dd32a0b9bad3e5a5daca3ff /meta/recipes-devtools/mmc/mmc-utils | |
parent | d6c13a5ff441f7076eb327c0d0b747bd7603db0f (diff) | |
download | openembedded-core-contrib-97dd1b0ab5524fe9cda53f60847f3e3c07cc90a8.tar.gz |
mmc-utils: Fix string overflow error
The SRCREV change bring another patch from upstream
b4fe0c8 fix ENH_START_ADDR overflow
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/mmc/mmc-utils')
-rw-r--r-- | meta/recipes-devtools/mmc/mmc-utils/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/mmc/mmc-utils/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch b/meta/recipes-devtools/mmc/mmc-utils/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch new file mode 100644 index 0000000000..62e25fde9b --- /dev/null +++ b/meta/recipes-devtools/mmc/mmc-utils/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch @@ -0,0 +1,36 @@ +From 175ac0f362bf6121c3537e2f1760ad41c8f81367 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Mar 2018 01:04:57 -0700 +Subject: [PATCH] lsmmc: replace strncpy with memmove on overlapping memory + copy + +here source and destination addresses are overlapping so using memmove is +going to be more efficient. + +Additionally, the bounded size for copy is overflowing for first copy + +In function 'strncpy', + inlined from 'read_file' at lsmmc.c:356:3: +/mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/mmc-utils/0.1-r0/recipe-sysroot/usr/include/bits/string_fortified.h:106:10: error: '__builtin_strncpy' accessing 4096 bytes at offsets 0 and 1 overlaps 4095 bytes at offset 1 [-Werror=restrict] + return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10314723/] + lsmmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lsmmc.c b/lsmmc.c +index c4faa00..bcb854d 100644 +--- a/lsmmc.c ++++ b/lsmmc.c +@@ -353,7 +353,7 @@ char *read_file(char *name) + line[strlen(line) - 1] = '\0'; + + while (isspace(line[0])) +- strncpy(&line[0], &line[1], sizeof(line)); ++ memmove(&line[0], &line[1], sizeof(line)-1); + + return strdup(line); + } |