Günther Deschner
parent
aebb79dafe
commit
26be169cca
1
.gitignore
vendored
1
.gitignore
vendored
@ -54,3 +54,4 @@ samba-3.6.0pre1.tar.gz
|
||||
/samba-4.3.0rc4.tar.xz
|
||||
/samba-4.3.0.tar.xz
|
||||
/samba-4.3.1.tar.xz
|
||||
/samba-4.3.2.tar.xz
|
||||
|
||||
@ -1,117 +0,0 @@
|
||||
From 790713a900479f3caf3b9668368585f09d94dfd4 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Metzmacher <metze@samba.org>
|
||||
Date: Wed, 21 Oct 2015 12:01:26 +0200
|
||||
Subject: [PATCH] dcerpc.idl: accept invalid dcerpc_bind_nak pdus
|
||||
|
||||
Older Samba versions (<= 4.1) had a bug in the dcerpc_bind_nak
|
||||
idl, see commit f73ef3028c4f4583c81b611a9714608eae79360c.
|
||||
|
||||
Note: ndr_pull_dcerpc_bind_nak() was generated by pidl and
|
||||
has been extended by the (_available == 0) check.
|
||||
That's why we ignore the 80 char per line limit.
|
||||
|
||||
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11327
|
||||
|
||||
Signed-off-by: Stefan Metzmacher <metze@samba.org>
|
||||
Reviewed-by: Volker Lendecke <vl@samba.org>
|
||||
|
||||
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
|
||||
Autobuild-Date(master): Wed Oct 21 20:34:28 CEST 2015 on sn-devel-104
|
||||
|
||||
(cherry picked from commit 38d547bc0d39b56a7491a5f220905f1756c1530a)
|
||||
---
|
||||
librpc/idl/dcerpc.idl | 6 +++---
|
||||
librpc/ndr/ndr_dcerpc.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 52 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/librpc/idl/dcerpc.idl b/librpc/idl/dcerpc.idl
|
||||
index 63be48e..1036693 100644
|
||||
--- a/librpc/idl/dcerpc.idl
|
||||
+++ b/librpc/idl/dcerpc.idl
|
||||
@@ -114,7 +114,7 @@ interface dcerpc
|
||||
[flag(NDR_REMAINING)] DATA_BLOB auth_info;
|
||||
} dcerpc_bind_ack;
|
||||
|
||||
- typedef [enum16bit] enum {
|
||||
+ typedef [public,enum16bit] enum {
|
||||
DCERPC_BIND_NAK_REASON_NOT_SPECIFIED = 0,
|
||||
DCERPC_BIND_NAK_REASON_TEMPORARY_CONGESTION = 1,
|
||||
DCERPC_BIND_NAK_REASON_LOCAL_LIMIT_EXCEEDED = 2,
|
||||
@@ -128,12 +128,12 @@ interface dcerpc
|
||||
const int DCERPC_BIND_REASON_INVALID_AUTH_TYPE =
|
||||
DCERPC_BIND_NAK_REASON_INVALID_AUTH_TYPE;
|
||||
|
||||
- typedef struct {
|
||||
+ typedef [public] struct {
|
||||
uint8 rpc_vers; /* RPC version */
|
||||
uint8 rpc_vers_minor; /* Minor version */
|
||||
} dcerpc_bind_nak_version;
|
||||
|
||||
- typedef struct {
|
||||
+ typedef [public,nopull] struct {
|
||||
dcerpc_bind_nak_reason reject_reason;
|
||||
uint8 num_versions;
|
||||
dcerpc_bind_nak_version versions[num_versions];
|
||||
diff --git a/librpc/ndr/ndr_dcerpc.c b/librpc/ndr/ndr_dcerpc.c
|
||||
index ca09fb6..0224b2c 100644
|
||||
--- a/librpc/ndr/ndr_dcerpc.c
|
||||
+++ b/librpc/ndr/ndr_dcerpc.c
|
||||
@@ -24,6 +24,55 @@
|
||||
#include "librpc/gen_ndr/ndr_dcerpc.h"
|
||||
#include "librpc/gen_ndr/ndr_misc.h"
|
||||
|
||||
+/*
|
||||
+ * This function was generated by pidl and
|
||||
+ * has been extended by the (_available == 0) check.
|
||||
+ *
|
||||
+ * That's why we ignore the 80 char per line limit.
|
||||
+ */
|
||||
+enum ndr_err_code ndr_pull_dcerpc_bind_nak(struct ndr_pull *ndr, int ndr_flags, struct dcerpc_bind_nak *r)
|
||||
+{
|
||||
+ uint32_t size_versions_0 = 0;
|
||||
+ uint32_t cntr_versions_0;
|
||||
+ TALLOC_CTX *_mem_save_versions_0 = NULL;
|
||||
+ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
|
||||
+ if (ndr_flags & NDR_SCALARS) {
|
||||
+ uint32_t _available;
|
||||
+ NDR_CHECK(ndr_pull_align(ndr, 4));
|
||||
+ NDR_CHECK(ndr_pull_dcerpc_bind_nak_reason(ndr, NDR_SCALARS, &r->reject_reason));
|
||||
+ _available = ndr->data_size - ndr->offset;
|
||||
+ if (_available == 0) {
|
||||
+ /*
|
||||
+ * This works around a bug in older
|
||||
+ * Samba (<= 4.1) releases.
|
||||
+ *
|
||||
+ * See bug #11327.
|
||||
+ */
|
||||
+ r->num_versions = 0;
|
||||
+ } else {
|
||||
+ NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->num_versions));
|
||||
+ }
|
||||
+ size_versions_0 = r->num_versions;
|
||||
+ NDR_PULL_ALLOC_N(ndr, r->versions, size_versions_0);
|
||||
+ _mem_save_versions_0 = NDR_PULL_GET_MEM_CTX(ndr);
|
||||
+ NDR_PULL_SET_MEM_CTX(ndr, r->versions, 0);
|
||||
+ for (cntr_versions_0 = 0; cntr_versions_0 < (size_versions_0); cntr_versions_0++) {
|
||||
+ NDR_CHECK(ndr_pull_dcerpc_bind_nak_version(ndr, NDR_SCALARS, &r->versions[cntr_versions_0]));
|
||||
+ }
|
||||
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_versions_0, 0);
|
||||
+ {
|
||||
+ uint32_t _flags_save_DATA_BLOB = ndr->flags;
|
||||
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
|
||||
+ NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->_pad));
|
||||
+ ndr->flags = _flags_save_DATA_BLOB;
|
||||
+ }
|
||||
+ NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
|
||||
+ }
|
||||
+ if (ndr_flags & NDR_BUFFERS) {
|
||||
+ }
|
||||
+ return NDR_ERR_SUCCESS;
|
||||
+}
|
||||
+
|
||||
const uint8_t DCERPC_SEC_VT_MAGIC[] = {0x8a,0xe3,0x13,0x71,0x02,0xf4,0x36,0x71};
|
||||
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_dcerpc_sec_vt_count(struct ndr_push *ndr, int ndr_flags, const struct dcerpc_sec_vt_count *r)
|
||||
--
|
||||
1.9.1
|
||||
|
||||
31
samba-4.3.3-async_connect_send_test.patch
Normal file
31
samba-4.3.3-async_connect_send_test.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From 632114584d3be0d4660e97a6c9e69e577a7bc1e2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
|
||||
Date: Tue, 1 Dec 2015 14:39:37 +0100
|
||||
Subject: [PATCH] lib/async_req: do not install async_connect_send_test.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Guenther
|
||||
|
||||
Signed-off-by: Günther Deschner <gd@samba.org>
|
||||
Reviewed-by: Ralph Boehme <slow@samba.org>
|
||||
---
|
||||
lib/async_req/wscript_build | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/async_req/wscript_build b/lib/async_req/wscript_build
|
||||
index 9c25223..bf79fdd 100644
|
||||
--- a/lib/async_req/wscript_build
|
||||
+++ b/lib/async_req/wscript_build
|
||||
@@ -9,5 +9,6 @@ bld.SAMBA_SUBSYSTEM('LIBASYNC_REQ',
|
||||
|
||||
bld.SAMBA_BINARY('async_connect_send_test',
|
||||
source='async_connect_send_test.c',
|
||||
- deps='LIBASYNC_REQ'
|
||||
+ deps='LIBASYNC_REQ',
|
||||
+ install=False
|
||||
)
|
||||
--
|
||||
2.5.0
|
||||
|
||||
11
samba.spec
11
samba.spec
@ -6,9 +6,9 @@
|
||||
# ctdb is enabled by default, you can disable it with: --without clustering
|
||||
%bcond_without clustering
|
||||
|
||||
%define main_release 3
|
||||
%define main_release 1
|
||||
|
||||
%define samba_version 4.3.1
|
||||
%define samba_version 4.3.2
|
||||
%define talloc_version 2.1.3
|
||||
%define tdb_version 1.3.7
|
||||
%define tevent_version 0.9.25
|
||||
@ -107,7 +107,7 @@ Source6: samba.pamd
|
||||
Source200: README.dc
|
||||
Source201: README.downgrade
|
||||
|
||||
Patch0: samba-4.3.2-dcerpc_bind_nak.patch
|
||||
Patch0: samba-4.3.3-async_connect_send_test.patch
|
||||
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
@ -680,7 +680,7 @@ and use CTDB instead.
|
||||
%prep
|
||||
%setup -q -n samba-%{version}%{pre_release}
|
||||
|
||||
%patch0 -p1 -b .samba-4.3.2-dcerpc_bind_nak.patch
|
||||
%patch0 -p1 -b .samba-4.3.3-async_connect_send_test.patch
|
||||
|
||||
%build
|
||||
%global _talloc_lib ,talloc,pytalloc,pytalloc-util
|
||||
@ -1989,6 +1989,9 @@ rm -rf %{buildroot}
|
||||
%endif # with_clustering_support
|
||||
|
||||
%changelog
|
||||
* Tue Dec 01 2015 Guenther Deschner <gdeschner@redhat.com> - 4.3.2-1
|
||||
- resolves: #1261230 - Update to Samba 4.3.2
|
||||
|
||||
* Wed Nov 18 2015 Guenther Deschner <gdeschner@redhat.com> - 4.3.1-3
|
||||
- resolves: #1282931 - Fix DCE/RPC bind nak parsing
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user