From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kyxnV-0004q2-Ph for ptxdist@pengutronix.de; Mon, 11 Jan 2021 15:03:54 +0100 Received: by mail-ed1-x52b.google.com with SMTP id u19so18959449edx.2 for ; Mon, 11 Jan 2021 06:03:53 -0800 (PST) From: Bruno Thomsen Date: Mon, 11 Jan 2021 15:03:43 +0100 Message-Id: <20210111140343.6747-1-bruno.thomsen@gmail.com> MIME-Version: 1.0 Subject: [ptxdist] [PATCH] mmc-utils: version bump b4fe0c8c0e57 -> 73d6c59af8d1 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Bruno Thomsen , bth@kamstrup.com 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 --- ...rncpy-with-memmove-on-overlapping-me.patch | 34 ------------------- .../mmc-utils-2018-03-27-gb4fe0c8c0e57/series | 4 --- rules/mmc-utils.make | 4 +-- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 patches/mmc-utils-2018-03-27-gb4fe0c8c0e57/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch delete mode 100644 patches/mmc-utils-2018-03-27-gb4fe0c8c0e57/series 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 858493d27..000000000 --- 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 -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 ---- - 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 6018eff4c..000000000 --- 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 ba1a10f42..5929d0788 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) base-commit: 5846d9453feecb0181a6234a49d9751cbd9f4b9f -- 2.29.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de