Changeset 746 for vendor/current/source3/libsmb/clireadwrite.c

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

• vendor/current/source3/libsmb/clireadwrite.c (modified) (10 diffs)

vendor/current/source3/libsmb/clireadwrite.c

@@ -134 +134 @@
         SSVAL(state->vwv + 9, 0, 0);
 
-        if ((uint64_t)offset >> 32) {
+        if (cli->capabilities & CAP_LARGE_FILES) {
                 SIVAL(state->vwv + 10, 0,
                       (((uint64_t)offset)>>32) & 0xffffffff);
-                wct += 2;
+                wct = 12;
+        } else {
+                if ((((uint64_t)offset) & 0xffffffff00000000LL) != 0) {
+                        DEBUG(10, ("cli_read_andx_send got large offset where "
+                                   "the server does not support it\n"));
+                        tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                        return tevent_req_post(req, ev);
+                }
         }
 
@@ -216 +223 @@
         state->buf = (uint8_t *)smb_base(inbuf) + SVAL(vwv+6, 0);
 
-        if (trans_oob(smb_len(inbuf), SVAL(vwv+6, 0), state->received)
+        if (trans_oob(smb_len_large(inbuf), SVAL(vwv+6, 0), state->received)
             || ((state->received != 0) && (state->buf < bytes))) {
                 DEBUG(5, ("server returned invalid read&x data offset\n"));
@@ -681 +688 @@
  fail:
         TALLOC_FREE(frame);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }
@@ -704 +708 @@
                           cli_read_sink, &buf, &ret);
         if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
                 return -1;
         }
@@ -812 +815 @@
         }
 
-        size = MIN(size, max_write);
+        state->size = MIN(size, max_write);
 
         vwv = state->vwv;
@@ -824 +827 @@
         SSVAL(vwv+7, 0, mode);
         SSVAL(vwv+8, 0, 0);
-        SSVAL(vwv+9, 0, (size>>16));
-        SSVAL(vwv+10, 0, size);
+        SSVAL(vwv+9, 0, (state->size>>16));
+        SSVAL(vwv+10, 0, state->size);
 
         SSVAL(vwv+11, 0,
@@ -842 +845 @@
         state->iov[0].iov_len = 1;
         state->iov[1].iov_base = CONST_DISCARD(void *, buf);
-        state->iov[1].iov_len = size;
+        state->iov[1].iov_len = state->size;
 
         subreq = cli_smb_req_create(state, ev, cli, SMBwriteX, 0, wct, vwv,
@@ -895 +898 @@
         }
         state->written = SVAL(vwv+2, 0);
-        state->written |= SVAL(vwv+4, 0)<<16;
+        if (state->size > UINT16_MAX) {
+                /*
+                 * It is important that we only set the
+                 * high bits only if we asked for a large write.
+                 *
+                 * OS/2 print shares get this wrong and may send
+                 * invalid values.
+                 *
+                 * See bug #5326.
+                 */
+                state->written |= SVAL(vwv+4, 0)<<16;
+        }
         tevent_req_done(req);
 }
@@ -1045 +1059 @@
  fail:
         TALLOC_FREE(frame);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }
@@ -1277 +1288 @@
  fail:
         TALLOC_FREE(frame);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }