sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-31 17:18:04 +03:00
Code

s4:torture/smb2: add samba3.smb2.ioctl.bug14607

Browse Source 
FSCTL_SMBTORTURE_IOCTL_RESPONSE_BODY_PADDING8 will be used
to trigger an SMB2 IOCTL response with extra padding.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14607

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Stefan Metzmacher 2021-01-14 17:39:18 +01:00 committed by Volker Lendecke
parent 508ed5b42c
commit 3db566026b
2 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcli/smb/smb_constants.h
View File

@ -598,6 +598,8 @@ enum csc_policy {
#define FSCTL_SMBTORTURE 0x83840000
#define FSCTL_SMBTORTURE_FORCE_UNACKED_TIMEOUT \
(FSCTL_SMBTORTURE | FSCTL_ACCESS_WRITE | 0x0000 | FSCTL_METHOD_NEITHER)
#define FSCTL_SMBTORTURE_IOCTL_RESPONSE_BODY_PADDING8 \
(FSCTL_SMBTORTURE | FSCTL_ACCESS_WRITE | 0x0010 | FSCTL_METHOD_NEITHER)
/*
* A few values from [MS-FSCC] 2.1.2.1 Reparse Tags

53
source4/torture/smb2/ioctl.c
View File

@ -6794,6 +6794,57 @@ static bool test_ioctl_dup_extents_dest_lck(struct torture_context *tctx,
return true;
}
/*
basic regression test for BUG 14607
https://bugzilla.samba.org/show_bug.cgi?id=14607
*/
static bool test_ioctl_bug14607(struct torture_context *torture,
struct smb2_tree *tree)
{
TALLOC_CTX *tmp_ctx = talloc_new(tree);
uint32_t timeout_msec;
NTSTATUS status;
DATA_BLOB out_input_buffer = data_blob_null;
DATA_BLOB out_output_buffer = data_blob_null;
timeout_msec = tree->session->transport->options.request_timeout * 1000;
status = smb2cli_ioctl(tree->session->transport->conn,
timeout_msec,
tree->session->smbXcli,
tree->smbXcli,
UINT64_MAX, /* in_fid_persistent */
UINT64_MAX, /* in_fid_volatile */
FSCTL_SMBTORTURE_IOCTL_RESPONSE_BODY_PADDING8,
0, /* in_max_input_length */
NULL, /* in_input_buffer */
1, /* in_max_output_length */
NULL, /* in_output_buffer */
SMB2_IOCTL_FLAG_IS_FSCTL,
tmp_ctx,
&out_input_buffer,
&out_output_buffer);
if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED) ||
NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) ||
NT_STATUS_EQUAL(status, NT_STATUS_FS_DRIVER_REQUIRED) ||
NT_STATUS_EQUAL(status, NT_STATUS_INVALID_DEVICE_REQUEST))
{
torture_comment(torture,
"FSCTL_SMBTORTURE_IOCTL_RESPONSE_BODY_PADDING8: %s\n",
nt_errstr(status));
torture_skip(torture, "server doesn't support FSCTL_SMBTORTURE_IOCTL_RESPONSE_BODY_PADDING8\n");
}
torture_assert_ntstatus_ok(torture, status, "FSCTL_SMBTORTURE_IOCTL_RESPONSE_BODY_PADDING8");
torture_assert_int_equal(torture, out_output_buffer.length, 1,
"output length");
torture_assert_int_equal(torture, out_output_buffer.data[0], 8,
"output buffer byte should be 8");
talloc_free(tmp_ctx);
return true;
}
/*
* testing of SMB2 ioctls
*/
@ -6939,6 +6990,8 @@ struct torture_suite *torture_smb2_ioctl_init(TALLOC_CTX *ctx)
test_ioctl_dup_extents_src_lck);
torture_suite_add_1smb2_test(suite, "dup_extents_dest_lock",
test_ioctl_dup_extents_dest_lck);
torture_suite_add_1smb2_test(suite, "bug14607",
test_ioctl_bug14607);
suite->description = talloc_strdup(suite, "SMB2-IOCTL tests");