Changeset 988 for vendor/current/source3/smbd/srvstr.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/smbd/srvstr.c (modified) (4 diffs)

vendor/current/source3/smbd/srvstr.c

@@ -25 +25 @@
 /* Make sure we can't write a string past the end of the buffer */
 
-size_t srvstr_push_fn(const char *function, unsigned int line,
-                      const char *base_ptr, uint16 smb_flags2, void *dest,
-                      const char *src, int dest_len, int flags)
+NTSTATUS srvstr_push_fn(const char *base_ptr, uint16_t smb_flags2, void *dest,
+                      const char *src, int dest_len, int flags, size_t *ret_len)
 {
+        size_t len;
+        int saved_errno;
+        NTSTATUS status;
+
         if (dest_len < 0) {
-                return 0;
+                return NT_STATUS_INVALID_PARAMETER;
         }
 
+        saved_errno = errno;
+        errno = 0;
+
         /* 'normal' push into size-specified buffer */
-        return push_string_base(function, line, base_ptr, smb_flags2, dest, src,
+        len = push_string_base(base_ptr, smb_flags2, dest, src,
                                 dest_len, flags);
+
+        if (errno != 0) {
+                /*
+                 * Special case E2BIG, EILSEQ, EINVAL
+                 * as they mean conversion errors here,
+                 * but we don't generically map them as
+                 * they can mean different things in
+                 * generic filesystem calls (such as
+                 * read xattrs).
+                 */
+                if (errno == E2BIG || errno == EILSEQ || errno == EINVAL) {
+                        status = NT_STATUS_ILLEGAL_CHARACTER;
+                } else {
+                        status = map_nt_error_from_unix_common(errno);
+                        /*
+                         * Paranoia - Filter out STATUS_MORE_ENTRIES.
+                         * I don't think we can get this but it has a
+                         * specific meaning to the client.
+                         */
+                        if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
+                                status = NT_STATUS_UNSUCCESSFUL;
+                        }
+                }
+                DEBUG(10,("character conversion failure "
+                        "on string (%s) (%s)\n",
+                        src, strerror(errno)));
+        } else {
+                /* Success - restore untouched errno. */
+                errno = saved_errno;
+                *ret_len = len;
+                status = NT_STATUS_OK;
+        }
+        return status;
 }
 
@@ -43 +82 @@
 ********************************************************************/
 
-ssize_t message_push_string(uint8 **outbuf, const char *str, int flags)
+ssize_t message_push_string(uint8_t **outbuf, const char *str, int flags)
 {
         size_t buf_size = smb_len(*outbuf) + 4;
         size_t grow_size;
-        size_t result;
-        uint8 *tmp;
+        size_t result = 0;
+        uint8_t *tmp;
+        NTSTATUS status;
 
         /*
@@ -58 +98 @@
         grow_size = (strlen(str) + 2) * 4;
 
-        if (!(tmp = TALLOC_REALLOC_ARRAY(NULL, *outbuf, uint8,
+        if (!(tmp = talloc_realloc(NULL, *outbuf, uint8_t,
                                          buf_size + grow_size))) {
                 DEBUG(0, ("talloc failed\n"));
@@ -64 +104 @@
         }
 
-        result = srvstr_push((char *)tmp, SVAL(tmp, smb_flg2),
-                             tmp + buf_size, str, grow_size, flags);
+        status = srvstr_push((char *)tmp, SVAL(tmp, smb_flg2),
+                             tmp + buf_size, str, grow_size, flags, &result);
 
-        if (result == (size_t)-1) {
+        if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0, ("srvstr_push failed\n"));
                 return -1;