| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Tue, 12 Aug 2014 05:26:42 -0700 | |
| branch | s11-update |
| changeset 3260 | f7052d16f6f6 |
| permissions | -rw-r--r-- |
|
3260
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
1 |
Samba 3.6.23 patch for: |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
2 |
FSCTL_GET_SHADOW_COPY_DATA: Initialize output array to, zero |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
3 |
...derived from Christof Schmitt <[email protected]>'s patch for Samba 4.0 |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
4 |
http://www.samba.org/samba/ftp/patches/security/samba-4.0.17-CVE-2014-0178-CVE-2014-0239.patch |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
5 |
|
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
6 |
--- a/source3/smbd/nttrans.c 2014-03-11 03:17:34.000000000 -0700 |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
7 |
+++ samba-3.6.23/source3/smbd/nttrans.c 2014-06-18 06:17:02.771463164 -0700 |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
8 |
@@ -2303,7 +2303,7 @@ |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
9 |
if (!labels) {
|
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
10 |
*out_len = 16; |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
11 |
} else {
|
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
12 |
- *out_len = 12 + labels_data_count + 4; |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
13 |
+ *out_len = 12 + labels_data_count; |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
14 |
} |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
15 |
|
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
16 |
if (max_out_len < *out_len) {
|
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
17 |
@@ -2313,7 +2313,7 @@ |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
18 |
return NT_STATUS_BUFFER_TOO_SMALL; |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
19 |
} |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
20 |
|
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
21 |
- cur_pdata = talloc_array(ctx, char, *out_len); |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
22 |
+ cur_pdata = talloc_zero_array(ctx, char, *out_len); |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
23 |
if (cur_pdata == NULL) {
|
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
24 |
TALLOC_FREE(shadow_data); |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
25 |
return NT_STATUS_NO_MEMORY; |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
26 |
@@ -2330,7 +2330,7 @@ |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
27 |
} |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
28 |
|
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
29 |
/* needed_data_count 4 bytes */ |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
30 |
- SIVAL(cur_pdata, 8, labels_data_count + 4); |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
31 |
+ SIVAL(cur_pdata, 8, labels_data_count); |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
32 |
|
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
33 |
cur_pdata += 12; |
|
f7052d16f6f6
18875952 problem in UTILITY/SAMBA
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
34 |