Changeset 920 for trunk/server/source4/librpc/rpc/dcerpc.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)
• source4/librpc/rpc/dcerpc.c (modified) (3 diffs)

trunk/server/source4/librpc/rpc/dcerpc.c

@@ -700 +700 @@
         default:
                 return NT_STATUS_INVALID_LEVEL;
+        }
+
+        if (pkt->auth_length == 0) {
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+
+        if (c->security_state.generic_state == NULL) {
+                return NT_STATUS_INTERNAL_ERROR;
         }
 
@@ -1075 +1083 @@
 
         /* the bind_ack might contain a reply set of credentials */
-        if (conn->security_state.auth_info && pkt->u.bind_ack.auth_info.length) {
+        if (conn->security_state.auth_info && pkt->auth_length) {
                 NTSTATUS status;
                 uint32_t auth_length;
@@ -1848 +1856 @@
 
         /* the alter_resp might contain a reply set of credentials */
-        if (recv_pipe->conn->security_state.auth_info &&
-            pkt->u.alter_resp.auth_info.length) {
+        if (recv_pipe->conn->security_state.auth_info && pkt->auth_length) {
                 struct dcecli_connection *conn = recv_pipe->conn;
                 NTSTATUS status;