diff options
author | Jeremy Allison <jra@samba.org> | 2021-11-18 12:16:44 -0800 |
---|---|---|
committer | Jule Anger <janger@samba.org> | 2022-01-31 12:23:53 +0100 |
commit | 3e0d40f5481f2343fa93e204f2c432e1a2335c98 (patch) | |
tree | 05c289cf0342bec49deed373c8cfa3e662b0ce7c | |
parent | c7aa173d2a44b3cf254b3739c7aedc2d5c8c0d58 (diff) | |
download | samba-3e0d40f5481f2343fa93e204f2c432e1a2335c98.tar.gz |
CVE-2021-44141: s3: smbtorture3: Fix POSIX-BLOCKING-LOCK to actually negotiate SMB1+POSIX before using POSIX calls.
This must be done before doing POSIX calls on a connection.
Remove the final entry in knownfail.d/posix_infolevel_fails
samba3.smbtorture_s3.plain.POSIX-BLOCKING-LOCK.smbtorture\(nt4_dc_smb1\)
And remove the file knownfail.d/posix_infolevel_fails itself.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14911
Signed-off-by: Jeremy Allison <jra@samba.org>
-rw-r--r-- | selftest/knownfail.d/posix_infolevel_fails | 1 | ||||
-rw-r--r-- | source3/torture/torture.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/selftest/knownfail.d/posix_infolevel_fails b/selftest/knownfail.d/posix_infolevel_fails deleted file mode 100644 index bf8a884cb16..00000000000 --- a/selftest/knownfail.d/posix_infolevel_fails +++ /dev/null @@ -1 +0,0 @@ -^samba3.smbtorture_s3.plain.POSIX-BLOCKING-LOCK.smbtorture\(nt4_dc_smb1\) diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 0d3b01326b1..e3d26ddb261 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -8929,6 +8929,11 @@ static bool run_posix_blocking_lock(int dummy) return false; } + status = torture_setup_unix_extensions(cli2); + if (!NT_STATUS_IS_OK(status)) { + return false; + } + cli_setatr(cli1, fname, 0, 0); cli_posix_unlink(cli1, fname); |