stat: fix security issues

This patch avoids stat fails to compile with compiler flags which
elevate common string formatting issues into an error (-Wformat
-Wformat-security -Werror=format-security).

[YOCTO #9550]

(From OE-Core rev: f03c1f41933e9997a01a8b1dcdf9fb18579de1d1)

Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Edwin Plauchu 2016-05-17 14:25:35 -05:00 committed by Richard Purdie
parent 1613275de7
commit 8ed25517a9
3 changed files with 69 additions and 1 deletions

View File

@ -105,7 +105,6 @@ SECURITY_STRINGFORMAT_pn-gettext = ""
SECURITY_STRINGFORMAT_pn-kexec-tools = ""
SECURITY_STRINGFORMAT_pn-makedevs = ""
SECURITY_STRINGFORMAT_pn-oh-puzzles = ""
SECURITY_STRINGFORMAT_pn-stat = ""
SECURITY_STRINGFORMAT_pn-unzip = ""
SECURITY_STRINGFORMAT_pn-zip = ""

View File

@ -0,0 +1,68 @@
stat: Fixing security formatting issues
Fix security formatting issues related to printf without NULL argument
stat.c: In function 'print_human_access':
stat.c:292:13: error: format not a string literal and no format arguments [-Werror=format-security]
printf (access);
^
stat.c: In function 'print_human_time':
stat.c:299:57: error: format not a string literal and no format arguments [-Werror=format-security]
if (strftime(str, 40, "%c", localtime(t)) > 0) printf(str);
^
stat.c: In function 'print_it':
stat.c:613:6: error: format not a string literal and no format arguments [-Werror=format-security]
printf(b);
^
stat.c:642:6: error: format not a string literal and no format arguments [-Werror=format-security]
printf(b);
^
[YOCTO #9550]
[https://bugzilla.yoctoproject.org/show_bug.cgi?id=9550]
Upstream-Status: Pending
Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
diff --git a/stat.c b/stat.c
index 1ed07a9..2be6f62 100644
--- a/stat.c
+++ b/stat.c
@@ -289,15 +289,15 @@ void print_human_access(struct stat *statbuf)
default:
access[0] = '?';
}
- printf (access);
+ fputs(access,stdout);
}
void print_human_time(time_t *t)
{
char str[40];
- if (strftime(str, 40, "%c", localtime(t)) > 0) printf(str);
- else printf("Cannot calculate human readable time, sorry");
+ if (strftime(str, 40, "%c", localtime(t)) > 0) fputs(str,stdout);
+ else fputs("Cannot calculate human readable time, sorry",stdout);
}
/* print statfs info */
@@ -610,7 +610,7 @@ void print_it(char *masterformat, char *filename,
{
strcpy (pformat, "%");
*m++ = '\0';
- printf(b);
+ fputs(b,stdout);
/* copy all format specifiers to our format string */
while (isdigit(*m) || strchr("#0-+. I", *m))
@@ -639,7 +639,7 @@ void print_it(char *masterformat, char *filename,
}
else
{
- printf(b);
+ fputs(b,stdout);
b = NULL;
}
}

View File

@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=39886b077fd072e876e5c4c16310b631 \
file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/${BP}.tar.gz \
file://fix-security-format.patch \
file://fix-error-return.patch"
SRC_URI[md5sum] = "37e247e8e400ad9205f1b0500b728fd3"