smbd: prepare smb2_write.c for handling a negative offset

Use off_t instead of uint64_t for the offset in order to support negative
offsets coming in over the wire for SMB3 POSIX append-IO which enforces
offset=VFS_PWRITE_APPEND_OFFSET (-1) for all writes.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index 2675997b0fdcccf7de8f3f786ac9de8e4b37f66d..4db146caad54eecd4b8cb288a6145f1dfb28791b 100644 (file)
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -34,7 +34,7 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
                                               struct smbd_smb2_request *smb2req,
                                               struct files_struct *in_fsp,
                                               DATA_BLOB in_data,
-                                              uint64_t in_offset,
+                                              off_t in_offset,
                                               uint32_t in_flags);
 static NTSTATUS smbd_smb2_write_recv(struct tevent_req *req,
                                     uint32_t *out_count);
@@ -48,7 +48,7 @@ NTSTATUS smbd_smb2_request_process_write(struct smbd_smb2_request *req)
        uint16_t in_data_offset;
        uint32_t in_data_length;
        DATA_BLOB in_data_buffer;
-       uint64_t in_offset;
+       off_t in_offset;
        uint64_t in_file_id_persistent;
        uint64_t in_file_id_volatile;
        struct files_struct *in_fsp;
@@ -65,7 +65,7 @@ NTSTATUS smbd_smb2_request_process_write(struct smbd_smb2_request *req)
 
        in_data_offset          = SVAL(inbody, 0x02);
        in_data_length          = IVAL(inbody, 0x04);
-       in_offset               = BVAL(inbody, 0x08);
+       in_offset               = PULL_LE_I64(inbody, 0x08);
        in_file_id_persistent   = BVAL(inbody, 0x10);
        in_file_id_volatile     = BVAL(inbody, 0x18);
        in_flags                = IVAL(inbody, 0x2C);
@@ -178,7 +178,7 @@ struct smbd_smb2_write_state {
        files_struct *fsp;
        bool write_through;
        uint32_t in_length;
-       uint64_t in_offset;
+       off_t in_offset;
        uint32_t out_count;
 };
 
@@ -266,7 +266,7 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
                                               struct smbd_smb2_request *smb2req,
                                               struct files_struct *fsp,
                                               DATA_BLOB in_data,
-                                              uint64_t in_offset,
+                                              off_t in_offset,
                                               uint32_t in_flags)
 {
        NTSTATUS status;