author | Shawn Ferry <shawn.ferry@oracle.com> |
Wed, 30 Mar 2016 12:56:49 -0400 | |
changeset 5747 | 4441137c3e4a |
parent 5298 | 2de3b6013893 |
permissions | -rw-r--r-- |
5298
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
1 |
This patch was derived from ISC source differences between bind-9.10.3-P2 and bind-9.10.3-P3 |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
2 |
|
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
3 |
diff -r f899dcaa07f7 CHANGES |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
4 |
--- a/CHANGES Fri Jan 15 12:48:27 2016 +0000 |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ b/CHANGES Fri Jan 15 13:12:34 2016 +0000 |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
6 |
@@ -1,3 +1,8 @@ |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
7 |
+ --- 9.6-ESV-R11-P5 released --- |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
8 |
+ |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
9 |
+4285. [security] Specific APL data could trigger a INSIST. |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
10 |
+ (CVE-2015-8704) [RT #41396] |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
11 |
+ |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
12 |
--- 9.6-ESV-R11-P4 released --- |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
13 |
|
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
14 |
4260. [security] Insufficient testing when parsing a message allowed |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
15 |
diff -r f899dcaa07f7 lib/dns/rdata/in_1/apl_42.c |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
16 |
--- a/lib/dns/rdata/in_1/apl_42.c Fri Jan 15 12:48:27 2016 +0000 |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
17 |
+++ b/lib/dns/rdata/in_1/apl_42.c Fri Jan 15 13:12:34 2016 +0000 |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
18 |
@@ -116,7 +116,7 @@ |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
19 |
isc_uint8_t len; |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
20 |
isc_boolean_t neg; |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
21 |
unsigned char buf[16]; |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
22 |
- char txt[sizeof(" !64000")]; |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
23 |
+ char txt[sizeof(" !64000:")]; |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
24 |
const char *sep = ""; |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
25 |
int n; |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
26 |
|
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
27 |
@@ -140,7 +140,7 @@ |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
28 |
isc_region_consume(&sr, 1); |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
29 |
INSIST(len <= sr.length); |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
30 |
n = snprintf(txt, sizeof(txt), "%s%s%u:", sep, |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
31 |
- neg ? "!": "", afi); |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
32 |
+ neg ? "!" : "", afi); |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
33 |
INSIST(n < (int)sizeof(txt)); |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
34 |
RETERR(str_totext(txt, target)); |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
35 |
switch (afi) { |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
36 |
diff -r f899dcaa07f7 version |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
37 |
--- a/version Fri Jan 15 12:48:27 2016 +0000 |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
38 |
+++ b/version Fri Jan 15 13:12:34 2016 +0000 |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
39 |
@@ -10,4 +10,4 @@ |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
40 |
PATCHVER= |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
41 |
RELEASETYPE=-ESV |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
42 |
RELEASEVER=-R11 |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
43 |
-EXTENSIONS=-P4 |
2de3b6013893
22552124 Upgrade BIND to 9.6-ESV-R11-P5
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff
changeset
|
44 |
+EXTENSIONS=-P5 |