Fix string formatting issue in console-tools
v2 cover Fix string formatting issue in console-tools
The following changes since commit a624cf7f95c8cf4ff764cc997fd1db4601b97dcc:
oeqa/selftest/pkgdata: use m4 instead of bash (2017-02-07 14:50:10 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/BUG9540
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/BUG9540
Chen Qi (2):
console-tools: fix string formatting issue
security_flags: enable string formatting check for console tools
meta/conf/distro/include/security_flags.inc | 1 - ...001-Fix-format-security-compilation-error.patch | 57 ++++++++++++++++++++++ .../console-tools/console-tools_0.3.2.bb | 1 + 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch
Signature · 1 line
1.9.1
PATCH v2 1/2 console-tools: fix string formatting issue
Fix string formatting issue in console-tools. Otherwise, when compiling with '-Wformat -Wformat-security -Werror=format-security', we would have compilation error.
[YOCTO #9540]
--- ...001-Fix-format-security-compilation-error.patch | 57 ++++++++++++++++++++++ .../console-tools/console-tools_0.3.2.bb | 1 + 2 files changed, 58 insertions(+) create mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch
meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch new file +57 -0
@@ -0,0 +1,57 @@ +Subject: Fix 'format-security' compilation error. + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <[email protected]> +--- + kbdtools/kbd_mode.c | 6 +++--- + kbdtools/setmetamode.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/kbdtools/kbd_mode.c b/kbdtools/kbd_mode.c +index 02dca38..8dbcd39 100644 +--- a/kbdtools/kbd_mode.c ++++ b/kbdtools/kbd_mode.c +@@ -120,7 +120,7 @@ int main(int argc, char *argv[]) + /* report mode */ + if (ioctl(fd, KDGKBMODE, &mode)) + { +- fprintf(stderr, progname); ++ fprintf(stderr, "%s", progname); + perror(_(": error reading keyboard mode\n")); + exit(1); + } +@@ -151,7 +151,7 @@ int main(int argc, char *argv[]) + kbd_rep.period = rate; + if (ioctl(fd, KDKBDREP, &kbd_rep)) + { +- fprintf(stderr, progname); ++ fprintf(stderr, "%s", progname); + perror(_(": error setting keyboard repeat mode\n")); + exit(1); + } +@@ -160,7 +160,7 @@ int main(int argc, char *argv[]) + + if (ioctl(fd, KDSKBMODE, mode)) + { +- fprintf(stderr, progname); ++ fprintf(stderr, "%s", progname); + perror(_(": error setting keyboard mode\n")); + exit(1); + } +diff --git a/kbdtools/setmetamode.c b/kbdtools/setmetamode.c +index 5bed945..0ba7676 100644 +--- a/kbdtools/setmetamode.c ++++ b/kbdtools/setmetamode.c +@@ -42,7 +42,7 @@ void report(int meta) + default: + s = N_("Strange mode for Meta key?\n"); + } +- printf(_(s)); ++ printf("%s", _(s)); + } + + struct meta +-- +2.8.3 +
meta/recipes-core/console-tools/console-tools_0.3.2.bb +1 -0
@@ -16,6 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ file://no-dep-on-libfl.patch \ file://0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch \ file://0001-Cover-the-else-with-__GLIBC__.patch \ + file://0001-Fix-format-security-compilation-error.patch \ file://lcmessage.m4 \ file://Makevars"
Signature · 1 line
1.9.1
PATCH v2 2/2 security_flags: enable string formatting check for console tools
In reply to Chen QiAs we've fixed the string formatting issue in console-tools, we don't need to override SECURITY_STRINGFORMAT for console-tools any more.
[YOCTO #9540]
--- meta/conf/distro/include/security_flags.inc | 1 - 1 file changed, 1 deletion(-)
meta/conf/distro/include/security_flags.inc +0 -1
@@ -91,7 +91,6 @@ SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}" # Recipes which fail to compile when elevating -Wformat-security to an error SECURITY_STRINGFORMAT_pn-busybox = "" -SECURITY_STRINGFORMAT_pn-console-tools = "" SECURITY_STRINGFORMAT_pn-cmake = "" SECURITY_STRINGFORMAT_pn-expect = "" SECURITY_STRINGFORMAT_pn-gcc = ""
Signature · 1 line
1.9.1