Changeset 920 for trunk/server/librpc/ndr/ndr_basic.c

Timestamp:

Jun 9, 2016, 2:23:12 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: apply latest security patches to trunk

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/ndr/ndr_basic.c (modified) (34 diffs)

trunk/server/librpc/ndr/ndr_basic.c

@@ -62 +62 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_int8(struct ndr_pull *ndr, int ndr_flags, int8_t *v)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PULL_NEED_BYTES(ndr, 1);
         *v = (int8_t)CVAL(ndr->data, ndr->offset);
@@ -73 +74 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_uint8(struct ndr_pull *ndr, int ndr_flags, uint8_t *v)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PULL_NEED_BYTES(ndr, 1);
         *v = CVAL(ndr->data, ndr->offset);
@@ -84 +86 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_int16(struct ndr_pull *ndr, int ndr_flags, int16_t *v)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PULL_ALIGN(ndr, 2);
         NDR_PULL_NEED_BYTES(ndr, 2);
@@ -96 +99 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_uint16(struct ndr_pull *ndr, int ndr_flags, uint16_t *v)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PULL_ALIGN(ndr, 2);
         NDR_PULL_NEED_BYTES(ndr, 2);
@@ -108 +112 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_uint1632(struct ndr_pull *ndr, int ndr_flags, uint16_t *v)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         if (unlikely(ndr->flags & LIBNDR_FLAG_NDR64)) {
                 uint32_t v32 = 0;
@@ -126 +131 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_int32(struct ndr_pull *ndr, int ndr_flags, int32_t *v)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PULL_ALIGN(ndr, 4);
         NDR_PULL_NEED_BYTES(ndr, 4);
@@ -138 +144 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_uint32(struct ndr_pull *ndr, int ndr_flags, uint32_t *v)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PULL_ALIGN(ndr, 4);
         NDR_PULL_NEED_BYTES(ndr, 4);
@@ -152 +159 @@
         uint64_t v64;
         enum ndr_err_code err;
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         if (likely(!(ndr->flags & LIBNDR_FLAG_NDR64))) {
                 return ndr_pull_uint32(ndr, ndr_flags, v);
@@ -170 +178 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_double(struct ndr_pull *ndr, int ndr_flags, double *v)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PULL_ALIGN(ndr, 8);
         NDR_PULL_NEED_BYTES(ndr, 8);
@@ -218 +227 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_udlong(struct ndr_pull *ndr, int ndr_flags, uint64_t *v)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PULL_ALIGN(ndr, 4);
         NDR_PULL_NEED_BYTES(ndr, 8);
@@ -231 +241 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_udlongr(struct ndr_pull *ndr, int ndr_flags, uint64_t *v)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PULL_ALIGN(ndr, 4);
         NDR_PULL_NEED_BYTES(ndr, 8);
@@ -265 +276 @@
 {
         uintptr_t h;
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PULL_ALIGN(ndr, sizeof(h));
         NDR_PULL_NEED_BYTES(ndr, sizeof(h));
@@ -279 +291 @@
 {
         uint32_t v;
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
         *status = NT_STATUS(v);
@@ -303 +316 @@
 {
         uint32_t v;
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
         *status = W_ERROR(v);
@@ -415 +429 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_array_uint8(struct ndr_pull *ndr, int ndr_flags, uint8_t *data, uint32_t n)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         if (!(ndr_flags & NDR_SCALARS)) {
                 return NDR_ERR_SUCCESS;
@@ -426 +441 @@
 _PUBLIC_ enum ndr_err_code ndr_push_int8(struct ndr_push *ndr, int ndr_flags, int8_t v)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PUSH_NEED_BYTES(ndr, 1);
         SCVAL(ndr->data, ndr->offset, (uint8_t)v);
@@ -437 +453 @@
 _PUBLIC_ enum ndr_err_code ndr_push_uint8(struct ndr_push *ndr, int ndr_flags, uint8_t v)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PUSH_NEED_BYTES(ndr, 1);
         SCVAL(ndr->data, ndr->offset, v);
@@ -448 +465 @@
 _PUBLIC_ enum ndr_err_code ndr_push_int16(struct ndr_push *ndr, int ndr_flags, int16_t v)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PUSH_ALIGN(ndr, 2);
         NDR_PUSH_NEED_BYTES(ndr, 2);
@@ -460 +478 @@
 _PUBLIC_ enum ndr_err_code ndr_push_uint16(struct ndr_push *ndr, int ndr_flags, uint16_t v)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PUSH_ALIGN(ndr, 2);
         NDR_PUSH_NEED_BYTES(ndr, 2);
@@ -483 +502 @@
 _PUBLIC_ enum ndr_err_code ndr_push_int32(struct ndr_push *ndr, int ndr_flags, int32_t v)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PUSH_ALIGN(ndr, 4);
         NDR_PUSH_NEED_BYTES(ndr, 4);
@@ -495 +515 @@
 _PUBLIC_ enum ndr_err_code ndr_push_uint32(struct ndr_push *ndr, int ndr_flags, uint32_t v)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PUSH_ALIGN(ndr, 4);
         NDR_PUSH_NEED_BYTES(ndr, 4);
@@ -518 +539 @@
 _PUBLIC_ enum ndr_err_code ndr_push_udlong(struct ndr_push *ndr, int ndr_flags, uint64_t v)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PUSH_ALIGN(ndr, 4);
         NDR_PUSH_NEED_BYTES(ndr, 8);
@@ -531 +553 @@
 _PUBLIC_ enum ndr_err_code ndr_push_udlongr(struct ndr_push *ndr, int ndr_flags, uint64_t v)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PUSH_ALIGN(ndr, 4);
         NDR_PUSH_NEED_BYTES(ndr, 8);
@@ -564 +587 @@
 _PUBLIC_ enum ndr_err_code ndr_push_double(struct ndr_push *ndr, int ndr_flags, double v)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PUSH_ALIGN(ndr, 8);
         NDR_PUSH_NEED_BYTES(ndr, 8);
@@ -577 +601 @@
 {
         uintptr_t h = (intptr_t)v;
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_PUSH_ALIGN(ndr, sizeof(h));
         NDR_PUSH_NEED_BYTES(ndr, sizeof(h));
@@ -687 +712 @@
 _PUBLIC_ enum ndr_err_code ndr_push_array_uint8(struct ndr_push *ndr, int ndr_flags, const uint8_t *data, uint32_t n)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         if (!(ndr_flags & NDR_SCALARS)) {
                 return NDR_ERR_SUCCESS;
@@ -739 +765 @@
 _PUBLIC_ enum ndr_err_code ndr_push_NTTIME(struct ndr_push *ndr, int ndr_flags, NTTIME t)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_CHECK(ndr_push_udlong(ndr, ndr_flags, t));
         return NDR_ERR_SUCCESS;
@@ -748 +775 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_NTTIME(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_CHECK(ndr_pull_udlong(ndr, ndr_flags, t));
         return NDR_ERR_SUCCESS;
@@ -757 +785 @@
 _PUBLIC_ enum ndr_err_code ndr_push_NTTIME_1sec(struct ndr_push *ndr, int ndr_flags, NTTIME t)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         t /= 10000000;
         NDR_CHECK(ndr_push_hyper(ndr, ndr_flags, t));
@@ -767 +796 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_NTTIME_1sec(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_CHECK(ndr_pull_hyper(ndr, ndr_flags, t));
         (*t) *= 10000000;
@@ -777 +807 @@
 _PUBLIC_ enum ndr_err_code ndr_pull_NTTIME_hyper(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
 {
+        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
         NDR_CHECK(ndr_pull_hyper(ndr, ndr_flags, t));
         return NDR_ERR_SUCCESS;
@@ -786 +817 @@
 _PUBLIC_ enum ndr_err_code ndr_push_NTTIME_hyper(struct ndr_push *ndr, int ndr_flags, NTTIME t)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         NDR_CHECK(ndr_push_hyper(ndr, ndr_flags, t));
         return NDR_ERR_SUCCESS;
@@ -815 +847 @@
 _PUBLIC_ enum ndr_err_code ndr_push_uid_t(struct ndr_push *ndr, int ndr_flags, uid_t u)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         return ndr_push_hyper(ndr, NDR_SCALARS, (uint64_t)u);
 }
@@ -840 +873 @@
 _PUBLIC_ enum ndr_err_code ndr_push_gid_t(struct ndr_push *ndr, int ndr_flags, gid_t g)
 {
+        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
         return ndr_push_hyper(ndr, NDR_SCALARS, (uint64_t)g);
 }