diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-07 16:11:46 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-08 23:00:32 +0100 |
commit | 87d2e1c5b9b2392f41247e0a11ab2a213ad33470 (patch) | |
tree | 7f53505e3115fd652a243ecca08358dd293cbce1 /meta/recipes-devtools/mmc/mmc-utils | |
parent | 9a97ea263c571b27283c59e69c880df0fa094052 (diff) | |
download | poky-87d2e1c5b9b2392f41247e0a11ab2a213ad33470.tar.gz |
mmc-utils: update to the latest upstream code
mmc-utils doesn't do releases, add the git revision to PV.
Remove patch for an issue now fixed upstream.
(From OE-Core rev: ff131346395a58c1579a94f564975dde3fbcf5c8)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
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, 0 insertions, 36 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 deleted file mode 100644 index 62e25fde9b..0000000000 --- a/meta/recipes-devtools/mmc/mmc-utils/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 175ac0f362bf6121c3537e2f1760ad41c8f81367 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 29 Mar 2018 01:04:57 -0700 | ||
4 | Subject: [PATCH] lsmmc: replace strncpy with memmove on overlapping memory | ||
5 | copy | ||
6 | |||
7 | here source and destination addresses are overlapping so using memmove is | ||
8 | going to be more efficient. | ||
9 | |||
10 | Additionally, the bounded size for copy is overflowing for first copy | ||
11 | |||
12 | In 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 | |||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | --- | ||
20 | Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10314723/] | ||
21 | lsmmc.c | 2 +- | ||
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/lsmmc.c b/lsmmc.c | ||
25 | index 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 | } | ||