From bd3ba3c96e6ba811afd5898ff5470188557a6e33 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 15 Sep 2021 17:25:53 +0200 Subject: [PATCH] smb2_server: decouple IOCTL check from signing/encryption states There's no reason to handle FSCTL_SMBTORTURE_FORCE_UNACKED_TIMEOUT differently if signing/encryption is used. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14788 Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme --- source3/smbd/smb2_server.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index fd02c129c40..6b66eb1d322 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -3174,7 +3174,9 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(session_status)) { return smbd_smb2_request_error(req, session_status); } - } else if (opcode == SMB2_OP_IOCTL) { + } + + if (opcode == SMB2_OP_IOCTL) { /* * Some special IOCTL calls don't require * file, tcon nor session. -- 2.34.1