Thanks, applied as 76dc2eb2d9d9422b8db554b07630176bac193b74. Michael
[sent from post-receive hook] On Fri, 15 Jan 2021 12:18:14 +0100, Bruno Thomsen <bruno.thom...@gmail.com> wrote: > Bumping version from 2018-03-27 to 2019-10-04 includes > the following 9 commit: > > 73d6c59 Add eMMC vendor Micron to table > 6c595ae Optimize to_binstr() function > c19c769 Fix parsing of character in to_binstr() > de27fd9 Cleanup memory in error case > de0715d Check calloc's return value before using the pointer > d40ec53 mmc-utils: feature spec 5.0+, add secure removal type fields to > Extended CSD > aef913e mmc-utils: use MMC_IOC_MULTI_CMD for RPMB access > 485b05e use proper type for RPMB blocks_cnt > bd23a79 fix GCC7 build by refactoring trimming routines > > Drop ptxdist patch as compile issue was fixed upstream in patch: > bd23a79e34ec "fix GCC7 build by refactoring trimming routines" > > Signed-off-by: Bruno Thomsen <bruno.thom...@gmail.com> > Message-Id: <20210111140343.6747-1-bruno.thom...@gmail.com> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git > a/patches/mmc-utils-2018-03-27-gb4fe0c8c0e57/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch > > b/patches/mmc-utils-2018-03-27-gb4fe0c8c0e57/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch > deleted file mode 100644 > index 858493d277c4..000000000000 > --- > a/patches/mmc-utils-2018-03-27-gb4fe0c8c0e57/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From: Khem Raj <raj.k...@gmail.com> > -Date: Thu, 29 Mar 2018 01:19:14 -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.k...@gmail.com> > ---- > - lsmmc.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/lsmmc.c b/lsmmc.c > -index c4faa002e780..bcb854daf3e1 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/patches/mmc-utils-2018-03-27-gb4fe0c8c0e57/series > b/patches/mmc-utils-2018-03-27-gb4fe0c8c0e57/series > deleted file mode 100644 > index 6018eff4c070..000000000000 > --- a/patches/mmc-utils-2018-03-27-gb4fe0c8c0e57/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch > -# eb541e33133cca3f061e8631e6c490ca - git-ptx-patches magic > diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make > index ba1a10f42d2b..5929d0788dea 100644 > --- a/rules/mmc-utils.make > +++ b/rules/mmc-utils.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_MMC_UTILS) += mmc-utils > # Paths and names > # > # No tags: use a fake descriptive commit-ish to include the date > -MMC_UTILS_VERSION := 2018-03-27-gb4fe0c8c0e57 > -MMC_UTILS_MD5 := 1018cdca94530054cc11e4bcb97d4b11 > +MMC_UTILS_VERSION := 2019-10-04-g73d6c59af8d1 > +MMC_UTILS_MD5 := 5d7c8db4f1735111d42773799e1a84bc > MMC_UTILS := mmc-utils-$(MMC_UTILS_VERSION) > MMC_UTILS_SUFFIX := tar.gz > MMC_UTILS_URL := > https://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;tag=$(MMC_UTILS_VERSION) _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
