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 22:59:45 +0100 |
| commit | ff131346395a58c1579a94f564975dde3fbcf5c8 (patch) | |
| tree | a5efa34d7dbc633a7bb0d73e2d172495a775af02 /meta | |
| parent | f262b9e7482e38f04dfa162f0aaf65b17e86f8b2 (diff) | |
| download | openembedded-core-contrib-ff131346395a58c1579a94f564975dde3fbcf5c8.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.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/mmc/mmc-utils/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-devtools/mmc/mmc-utils_git.bb | 5 |
2 files changed, 2 insertions, 39 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 @@ -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); - } diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb index 37a4755234..f3a7234670 100644 --- a/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb @@ -4,12 +4,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" SRCBRANCH ?= "master" -SRCREV = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d" +SRCREV = "aef913e31b659462fe6b9320d241676cba97f67b" -PV = "0.1" +PV = "0.1+git${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH} \ - file://0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch \ " UPSTREAM_CHECK_COMMITS = "1" |