summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-03-29 08:38:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-31 09:48:42 +0100
commit56bd66ee8e3f96622f9672efe660324fa66e93be (patch)
tree13e3282d418e3df6bee641ccfdf502ee1e6b641d
parentafd8490dcbd2755f1ed924ea6357ab922ed1f481 (diff)
downloadpoky-56bd66ee8e3f96622f9672efe660324fa66e93be.tar.gz
mmc-utils: Fix string overflow error
The SRCREV change bring another patch from upstream b4fe0c8 fix ENH_START_ADDR overflow (From OE-Core rev: 97dd1b0ab5524fe9cda53f60847f3e3c07cc90a8) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/mmc/mmc-utils/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch36
-rw-r--r--meta/recipes-devtools/mmc/mmc-utils_git.bb6
2 files changed, 40 insertions, 2 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 @@
1From 175ac0f362bf6121c3537e2f1760ad41c8f81367 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 29 Mar 2018 01:04:57 -0700
4Subject: [PATCH] lsmmc: replace strncpy with memmove on overlapping memory
5 copy
6
7here source and destination addresses are overlapping so using memmove is
8going to be more efficient.
9
10Additionally, the bounded size for copy is overflowing for first copy
11
12In function 'strncpy',
13 inlined from 'read_file' at lsmmc.c:356:3:
14/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]
15 return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
16 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10314723/]
21 lsmmc.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/lsmmc.c b/lsmmc.c
25index c4faa00..bcb854d 100644
26--- a/lsmmc.c
27+++ b/lsmmc.c
28@@ -353,7 +353,7 @@ char *read_file(char *name)
29 line[strlen(line) - 1] = '\0';
30
31 while (isspace(line[0]))
32- strncpy(&line[0], &line[1], sizeof(line));
33+ memmove(&line[0], &line[1], sizeof(line)-1);
34
35 return strdup(line);
36 }
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index 8977a87962..37a4755234 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -4,11 +4,13 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" 4LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d"
5 5
6SRCBRANCH ?= "master" 6SRCBRANCH ?= "master"
7SRCREV = "7bcad171173fd9a9401e7ce81906605bd6f4eddc" 7SRCREV = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d"
8 8
9PV = "0.1" 9PV = "0.1"
10 10
11SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH}" 11SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH} \
12 file://0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch \
13 "
12UPSTREAM_CHECK_COMMITS = "1" 14UPSTREAM_CHECK_COMMITS = "1"
13 15
14S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"