diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-06-20 07:14:16 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-06-22 16:03:00 +0200 |
| commit | 021844a31fb7081da8213338288596df0c281fe2 (patch) | |
| tree | af48041950563e6374f93f8a713df6289e8180fc /meta-oe/recipes-kernel | |
| parent | 251547bd2ee9417175cf8d4349f83cdbd7f8479e (diff) | |
| download | meta-openembedded-contrib-021844a31fb7081da8213338288596df0c281fe2.tar.gz | |
makedumpfile: Fix build with hardening
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-kernel')
| -rw-r--r-- | meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch | 35 | ||||
| -rw-r--r-- | meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb | 7 |
2 files changed, 39 insertions, 3 deletions
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch new file mode 100644 index 0000000000..056a0bade2 --- /dev/null +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch @@ -0,0 +1,35 @@ +From 0fff28f31aef9ad1d5a817216a3c98ba9d605106 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 19 Jun 2017 23:52:14 -0700 +Subject: [PATCH] makedumpfile: Add proper format string to print a string + +Fix +makedumpfile.c: In function 'write_eraseinfo': +makedumpfile.c:8273:4: error: format not a string literal and no format arguments [-Werror=format-security] + DEBUG_MSG(obuf); + ^~~~~~~~~ +makedumpfile.c:8273:4: error: format not a string literal and no format arguments [-Werror=format-security] + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + makedumpfile.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makedumpfile.c b/makedumpfile.c +index e69b6df..8b8a6b0 100644 +--- a/makedumpfile.c ++++ b/makedumpfile.c +@@ -8270,7 +8270,7 @@ write_eraseinfo(struct cache_data *cd_page, unsigned long *size_out) + } + sprintf(obuf, "erase %s %s", erase_info[i].symbol_expr, + size_str); +- DEBUG_MSG(obuf); ++ DEBUG_MSG("%s", obuf); + if (!write_cache(cd_page, obuf, strlen(obuf))) + goto out; + size_eraseinfo += strlen(obuf); +-- +2.13.1 + diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb index dacc76b04f..83bbf7f413 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb @@ -7,6 +7,9 @@ DESCRIPTION = "\ " HOMEPAGE = "http://makedumpfile.sourceforge.net" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +LICENSE = "GPLv2.0" + DEPENDS = "bzip2 zlib elfutils" RDEPENDS_${PN}-tools = "perl ${PN}" @@ -21,10 +24,8 @@ SRC_URI = "\ ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ + file://0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch \ " -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -LICENSE = "GPLv2.0" - SRC_URI[md5sum] = "16c0ae9902ae57be4a603a6ab1e86c53" SRC_URI[sha256sum] = "0b6e73106998670407887de9e1a505b3a2dbb2fb517a4b968a665eda8fb097ce" |