author | Sujan Srinivasa <sujan.srinivasa@oracle.com> |
Tue, 02 May 2017 04:07:24 -0700 | |
branch | s11u3-sru |
changeset 7958 | a40f2d0e1531 |
permissions | -rw-r--r-- |
7958
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
1 |
This patch has been taken from community and it addresses format string |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
2 |
vulnerabilities in a2ps component. |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
3 |
|
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
4 |
Original link: |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
5 |
http://www.openwall.com/lists/oss-security/2015/11/16/4 |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
6 |
|
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
7 |
This turned into CVE-2015-8107: |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
8 |
|
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
9 |
See: |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
10 |
|
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
11 |
http://seclists.org/oss-sec/2015/q4/284 |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
12 |
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2015-8107 |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
13 |
|
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
14 |
for more information. |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
15 |
|
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
16 |
Index: b/lib/psgen.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
17 |
=================================================================== |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
18 |
--- a/lib/psgen.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
19 |
+++ b/lib/psgen.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
20 |
@@ -232,7 +232,7 @@ |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
21 |
default: |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
22 |
*buf = '\0'; |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
23 |
ps_escape_char (job, cp[i], buf); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
24 |
- output (jdiv, (char *) buf); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
25 |
+ output (jdiv, "%s", (char *) buf); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
26 |
break; |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
27 |
} |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
28 |
} |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
29 |
Index: b/lib/output.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
30 |
=================================================================== |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
31 |
--- a/lib/output.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
32 |
+++ b/lib/output.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
33 |
@@ -525,7 +525,7 @@ |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
34 |
expand_user_string (job, FIRST_FILE (job), |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
35 |
(const uchar *) "Expand: requirement", |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
36 |
(const uchar *) token)); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
37 |
- output (dest, expansion); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
38 |
+ output (dest, "%s", expansion); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
39 |
continue; |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
40 |
} |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
41 |
|
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
42 |
Index: b/lib/parseppd.y |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
43 |
=================================================================== |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
44 |
--- a/lib/parseppd.y |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
45 |
+++ b/lib/parseppd.y |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
46 |
@@ -154,7 +154,7 @@ |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
47 |
void |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
48 |
yyerror (const char *msg) |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
49 |
{ |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
50 |
- error_at_line (1, 0, ppdfilename, ppdlineno, msg); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
51 |
+ error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
52 |
} |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
53 |
|
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
54 |
/* |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
55 |
Index: b/src/parsessh.y |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
56 |
=================================================================== |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
57 |
--- a/src/parsessh.y |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
58 |
+++ b/src/parsessh.y |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
59 |
@@ -740,7 +740,7 @@ |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
60 |
void |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
61 |
yyerror (const char *msg) |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
62 |
{ |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
63 |
- error_at_line (1, 0, sshfilename, sshlineno, msg); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
64 |
+ error_at_line (1, 0, sshfilename, sshlineno, "%s", msg); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
65 |
} |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
66 |
|
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
67 |
/* |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
68 |
Index: b/lib/parseppd.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
69 |
=================================================================== |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
70 |
--- a/lib/parseppd.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
71 |
+++ b/lib/parseppd.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
72 |
@@ -1707,7 +1707,7 @@ |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
73 |
void |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
74 |
yyerror (const char *msg) |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
75 |
{ |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
76 |
- error_at_line (1, 0, ppdfilename, ppdlineno, msg); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
77 |
+ error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
78 |
} |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
79 |
|
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
80 |
/* |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
81 |
Index: b/src/parsessh.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
82 |
=================================================================== |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
83 |
--- a/src/parsessh.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
84 |
+++ b/src/parsessh.c |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
85 |
@@ -2639,7 +2639,7 @@ |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
86 |
void |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
87 |
yyerror (const char *msg) |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
88 |
{ |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
89 |
- error_at_line (1, 0, sshfilename, sshlineno, msg); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
90 |
+ error_at_line (1, 0, sshfilename, sshlineno, "%s", msg); |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
91 |
} |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
92 |
|
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
93 |
/* |
a40f2d0e1531
22564022 problem in UTILITY/A2PS
Sujan Srinivasa <sujan.srinivasa@oracle.com>
parents:
diff
changeset
|
94 |