sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

s4:torture/smb2: fix and improve the smb2.lock.replay test

Browse Source 
The test was wrong in that it used an invalid
lock sequence bucket (65) where it actually wanted
to use a valid on (64), and hence the test results
(which were adapted to the real responses) were not
quite logical.

This patch fixes this and also improves some of
the comments so that the flow of the patch becomes
a little more obvious.

Pair-Programmed-With: Günther Deschner <gd@samba.org>

Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Michael Adam 2018-09-20 12:45:17 +02:00 committed by Jeremy Allison
parent fad2bd8ec7
commit 6b6086bb58
1 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
source4/torture/smb2/lock.c
View File

@ -2913,7 +2913,7 @@ static bool test_replay(struct torture_context *torture,
.in.file.handle = h
};
torture_comment(torture, "Testing Lock (ignored) Replay detection:\n");
torture_comment(torture, "Testing Lock Replay detection [ignored]:\n");
lck.in.lock_sequence = 0x010 + 0x1;
el.flags = SMB2_LOCK_FLAG_EXCLUSIVE | SMB2_LOCK_FLAG_FAIL_IMMEDIATELY;
status = smb2_lock(tree, &lck);
@ -2942,8 +2942,12 @@ static bool test_replay(struct torture_context *torture,
status = smb2_ioctl(tree, torture, &ioctl);
CHECK_STATUS(status, NT_STATUS_OK);
/*
* Test with an invalid bucket number (only 1..64 are valid).
* With an invalid number, lock replay detection is not performed.
*/
torture_comment(torture, "Testing Lock (ignored) Replay detection "
"(Bucket No: 0):\n");
"(Bucket No: 0 (invalid)) [ignored]:\n");
lck.in.lock_sequence = 0x000 + 0x1;
el.flags = SMB2_LOCK_FLAG_EXCLUSIVE | SMB2_LOCK_FLAG_FAIL_IMMEDIATELY;
status = smb2_lock(tree, &lck);
@ -2987,6 +2991,8 @@ static bool test_replay(struct torture_context *torture,
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_OK);
/* status: still locked */
/*
* Server will not grant same Byte Range using a different Bucket Seq
*/
@ -2997,13 +3003,55 @@ static bool test_replay(struct torture_context *torture,
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
torture_comment(torture, "Testing Lock Replay detection "
"(Bucket No: 2):\n");
/*
* Server will not grant same Byte Range using a different Bucket Num
*/
lck.in.lock_sequence = 0x020 + 0x1;
el.flags = SMB2_LOCK_FLAG_EXCLUSIVE | SMB2_LOCK_FLAG_FAIL_IMMEDIATELY;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
/* status: still locked */
/* test with invalid bucket when file is locked */
torture_comment(torture, "Testing Lock Replay detection "
"(Bucket No: 65 (invalid)) [ignored]:\n");
lck.in.lock_sequence = 0x410 + 0x1;
el.flags = SMB2_LOCK_FLAG_EXCLUSIVE | SMB2_LOCK_FLAG_FAIL_IMMEDIATELY;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
el.flags = SMB2_LOCK_FLAG_UNLOCK;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_OK);
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_RANGE_NOT_LOCKED);
/* status: unlocked */
/*
* Lock again for the unlock replay test
*/
el.flags = SMB2_LOCK_FLAG_EXCLUSIVE | SMB2_LOCK_FLAG_FAIL_IMMEDIATELY;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_OK);
torture_comment(torture, "Testing Lock Replay detection "
"(Bucket No: 64):\n");
/*
* Server will not grant same Byte Range using a different Bucket Num
*/
lck.in.lock_sequence = 0x410 + 0x1;
lck.in.lock_sequence = 0x400 + 0x1;
el.flags = SMB2_LOCK_FLAG_EXCLUSIVE | SMB2_LOCK_FLAG_FAIL_IMMEDIATELY;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
@ -3013,35 +3061,24 @@ static bool test_replay(struct torture_context *torture,
/*
* Test Unlock replay detection
*/
lck.in.lock_sequence = 0x410 + 0x2;
lck.in.lock_sequence = 0x400 + 0x2;
el.flags = SMB2_LOCK_FLAG_UNLOCK;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_OK);
CHECK_STATUS(status, NT_STATUS_OK); /* new seq num ==> unlocked */
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_OK);
CHECK_STATUS(status, NT_STATUS_OK); /* replay detected ==> ignored */
el.flags = SMB2_LOCK_FLAG_EXCLUSIVE | SMB2_LOCK_FLAG_FAIL_IMMEDIATELY;
status = smb2_lock(tree, &lck);
status = smb2_lock(tree, &lck); /* same seq num ==> ignored */
CHECK_STATUS(status, NT_STATUS_OK);
lck.in.lock_sequence = 0x410 + 0x3;
/* verify it's unlocked: */
lck.in.lock_sequence = 0x400 + 0x3;
el.flags = SMB2_LOCK_FLAG_UNLOCK;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_RANGE_NOT_LOCKED);
torture_comment(torture, "Testing Lock (ignored) Replay detection "
"(Bucket No: 65):\n");
lck.in.lock_sequence = 0x420 + 0x1;
el.flags = SMB2_LOCK_FLAG_EXCLUSIVE | SMB2_LOCK_FLAG_FAIL_IMMEDIATELY;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_OK);
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
el.flags = SMB2_LOCK_FLAG_UNLOCK;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_OK);
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_RANGE_NOT_LOCKED);
/* status: not locked */
done:
smb2_util_close(tree, h);