s3:libsmb: use clistr_pull_talloc() in cli_get_fs_volume_info()

metze

diff --git a/source3/client/client.c b/source3/client/client.c
index e2efad82d80d692c7244be21796903f280ddf402..aa26d99efff696e3e577ea8983e736735e9fab04 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3767,12 +3767,13 @@ static int cmd_rename(void)
 
 static int cmd_volume(void)
 {
-       fstring volname;
-       uint32 serial_num;
+       char *volname;
+       uint32_t serial_num;
        time_t create_date;
        NTSTATUS status;
 
-       status = cli_get_fs_volume_info(cli, volname, &serial_num,
+       status = cli_get_fs_volume_info(cli, talloc_tos(),
+                                       &volname, &serial_num,
                                        &create_date);
        if (!NT_STATUS_IS_OK(status)) {
                d_printf("Error %s getting volume info\n", nt_errstr(status));

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 0f2e473fdd90f2308b964cb03cc1b9140af351c1..02b257889251c80150abe48c21ff0b20116853af 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -354,15 +354,20 @@ fail:
        return status;
 }
 
-NTSTATUS cli_get_fs_volume_info(struct cli_state *cli, fstring volume_name,
-                               uint32 *pserial_number, time_t *pdate)
+NTSTATUS cli_get_fs_volume_info(struct cli_state *cli,
+                               TALLOC_CTX *mem_ctx,
+                               char **_volume_name,
+                               uint32_t *pserial_number,
+                               time_t *pdate)
 {
        NTSTATUS status;
-       uint16 setup[1];
+       uint16_t recv_flags2;
+       uint16_t setup[1];
        uint8_t param[2];
        uint8_t *rdata;
        uint32_t rdata_count;
        unsigned int nlen;
+       char *volume_name = NULL;
 
        SSVAL(setup, 0, TRANSACT2_QFSINFO);
        SSVAL(param,0,SMB_QUERY_FS_VOLUME_INFO);
@@ -372,7 +377,7 @@ NTSTATUS cli_get_fs_volume_info(struct cli_state *cli, fstring volume_name,
                           setup, 1, 0,
                           param, 2, 0,
                           NULL, 0, 560,
-                          NULL,
+                          &recv_flags2,
                           NULL, 0, NULL,
                           NULL, 0, NULL,
                           &rdata, 18, &rdata_count);
@@ -389,13 +394,28 @@ NTSTATUS cli_get_fs_volume_info(struct cli_state *cli, fstring volume_name,
                *pserial_number = IVAL(rdata,8);
        }
        nlen = IVAL(rdata,12);
-       clistr_pull(cli->inbuf, volume_name, rdata + 18, sizeof(fstring),
-                   nlen, STR_UNICODE);
+       if (nlen > (rdata_count - 18)) {
+               TALLOC_FREE(rdata);
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
+
+       clistr_pull_talloc(mem_ctx,
+                          (const char *)rdata,
+                          recv_flags2,
+                          &volume_name,
+                          rdata + 18,
+                          nlen, STR_UNICODE);
+       if (volume_name == NULL) {
+               status = map_nt_error_from_unix(errno);
+               TALLOC_FREE(rdata);
+               return status;
+       }
 
        /* todo: but not yet needed
         *       return the other stuff
         */
 
+       *_volume_name = volume_name;
        TALLOC_FREE(rdata);
        return NT_STATUS_OK;
 }

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 89f5857091f3e478182a813871feff08ad38c0a6..1919b084b5ec254bed88cd676347cbdc55cb454d 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -611,7 +611,8 @@ struct tevent_req *cli_get_fs_attr_info_send(TALLOC_CTX *mem_ctx,
                                             struct cli_state *cli);
 NTSTATUS cli_get_fs_attr_info_recv(struct tevent_req *req, uint32_t *fs_attr);
 NTSTATUS cli_get_fs_attr_info(struct cli_state *cli, uint32_t *fs_attr);
-NTSTATUS cli_get_fs_volume_info(struct cli_state *cli, fstring volume_name,
+NTSTATUS cli_get_fs_volume_info(struct cli_state *cli,
+                               TALLOC_CTX *mem_ctx, char **volume_name,
                                uint32 *pserial_number, time_t *pdate);
 NTSTATUS cli_get_fs_full_size_info(struct cli_state *cli,
                                   uint64_t *total_allocation_units,