[oe-commits] [openembedded-core] 21/23: makedevs: fix security issues

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 011b0ccc42c444c0b1649fb552e238fcb1e4b16b
Author: Edwin Plauchu <edwin.plauchu.camacho at intel.com>
AuthorDate: Tue May 17 14:26:16 2016 -0500

    makedevs: fix security issues
    
    This patch avoids makedevs fails to compile with compiler flags
    which elevate common string formatting issues into an error
    (-Wformat -Wformat-security -Werror=format-security).
    
    [YOCTO #9549]
    
    Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/conf/distro/include/security_flags.inc        |  1 -
 .../makedevs/makedevs/fix-security-format.patch    | 63 ++++++++++++++++++++++
 meta/recipes-devtools/makedevs/makedevs_1.0.1.bb   |  1 +
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index 5ae6dd8..426da30 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -103,7 +103,6 @@ SECURITY_STRINGFORMAT_pn-expect = ""
 SECURITY_STRINGFORMAT_pn-gcc = ""
 SECURITY_STRINGFORMAT_pn-gettext = ""
 SECURITY_STRINGFORMAT_pn-kexec-tools = ""
-SECURITY_STRINGFORMAT_pn-makedevs = ""
 SECURITY_STRINGFORMAT_pn-oh-puzzles = ""
 SECURITY_STRINGFORMAT_pn-unzip = ""
 SECURITY_STRINGFORMAT_pn-zip = ""
diff --git a/meta/recipes-devtools/makedevs/makedevs/fix-security-format.patch b/meta/recipes-devtools/makedevs/makedevs/fix-security-format.patch
new file mode 100644
index 0000000..3237f73
--- /dev/null
+++ b/meta/recipes-devtools/makedevs/makedevs/fix-security-format.patch
@@ -0,0 +1,63 @@
+makedevs: Fixing security formatting issues
+
+Fix security formatting issues related to printing without NULL argument 
+
+makedevs.c: In function 'main':
+makedevs.c:513:3: error: format not a string literal and no format arguments [-Werror=format-security]
+   fprintf(stderr, helptext);
+   ^
+makedevs.c:528:4: error: format not a string literal and no format arguments [-Werror=format-security]
+    printf(helptext);
+    ^
+makedevs.c:556:4: error: format not a string literal and no format arguments [-Werror=format-security]
+    fprintf(stderr, helptext);
+    ^
+makedevs.c:562:3: error: format not a string literal and no format arguments [-Werror=format-security]
+   fprintf(stderr, helptext);
+   ^
+
+[YOCTO #9549]
+[https://bugzilla.yoctoproject.org/show_bug.cgi?id=9549]
+
+Upstream-Status: Pending
+
+Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho at intel.com>
+
+diff --git a/makedevs.c b/makedevs.c
+index 771f33e..7471f3f 100644
+--- a/makedevs.c
++++ b/makedevs.c
+@@ -510,7 +510,7 @@ int main(int argc, char **argv)
+ 	umask (0);
+ 
+ 	if (argc==1) {
+-		fprintf(stderr, helptext);
++		fputs( helptext , stderr );
+ 		exit(1);
+ 	}
+ 
+@@ -525,7 +525,7 @@ int main(int argc, char **argv)
+ 				error_msg_and_die("%s: not a proper device table file", optarg);
+ 			break;
+ 		case 'h':
+-			printf(helptext);
++			puts(helptext);
+ 			exit(0);
+ 		case 'r':
+ 		case 'd':				/* for compatibility with mkfs.jffs, genext2fs, etc... */
+@@ -553,13 +553,13 @@ int main(int argc, char **argv)
+ 			printf("%s: %s\n", app_name, VERSION);
+ 			exit(0);
+ 		default:
+-			fprintf(stderr, helptext);
++			fputs(helptext,stderr);
+ 			exit(1);
+ 		}
+ 	}
+ 
+ 	if (argv[optind] != NULL) {
+-		fprintf(stderr, helptext);
++		fputs(helptext,stderr);
+ 		exit(1);
+ 	}
+ 
diff --git a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
index 92d5870..41b8bec 100644
--- a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
+++ b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
@@ -3,6 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 SECTION = "base"
 SRC_URI = "file://makedevs.c \
+           file://fix-security-format.patch \
            file://COPYING.patch"
 
 S = "${WORKDIR}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.