From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1464A352952; Fri, 9 Jan 2026 12:36:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767962186; cv=none; b=MWt5VYef46mTCpISQy130jNEr7nWjottGjbE4bLUqLj9KffTik956/f0fMGVSNqq+FQkex2HWIadCY4j7OR4iyFhbDpM9fcHn7DjOT1YlYQUxvxl8gYiWCqAXZu1PvL4GMNCp2pY0UAMMbnNxAwS0zyo6k2u1IPNPqM3KQI4gW4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767962186; c=relaxed/simple; bh=LrD/j3FsbHOzG/XoZ3bD7bg1Sb5d3H4lU18Shnpg6zA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FWILg0OLtdfh2E72OIfeuRaHy1w1brjCCZvQoVUBEaETtUEUP90FrcvX/3drcF3g5fm0OGKnu0XnMCe6nEMY1OPhA8T007074tgc6qiAGgHRrGzevHtiJ/37oWctPUichmSTpZhd9qN2ukfV5rgcyPO6uXXHfPBKXMMDwSNn2l8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=f9fzL5Pd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="f9fzL5Pd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9449AC4CEF1; Fri, 9 Jan 2026 12:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767962186; bh=LrD/j3FsbHOzG/XoZ3bD7bg1Sb5d3H4lU18Shnpg6zA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f9fzL5PdaY7MGwPPNnLA3VuqquVtsJmEZKstFTJHYxPOvNyQ8hczdFNgG7o/SP/t5 RxK6t6ccXCMLPqkRJtlVX6HWCaUxDegLgEtUB02Lx5zOPChWQB8QqrmFxbWYr3mxZQ c5EiiDt/OTtX8TzR1cHQRRo/EgVXO9tIFa+pilAw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, ChenXiaoSong , Namjae Jeon , Steve French , Sasha Levin Subject: [PATCH 6.1 244/634] smb/server: fix return value of smb2_ioctl() Date: Fri, 9 Jan 2026 12:38:42 +0100 Message-ID: <20260109112126.723945010@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260109112117.407257400@linuxfoundation.org> References: <20260109112117.407257400@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: ChenXiaoSong [ Upstream commit 269df046c1e15ab34fa26fd90db9381f022a0963 ] __process_request() will not print error messages if smb2_ioctl() always returns 0. Fix this by returning the correct value at the end of function. Signed-off-by: ChenXiaoSong Acked-by: Namjae Jeon Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/smb/server/smb2pdu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index 5a405706694b3..c50dbbfc4cd62 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -7727,7 +7727,7 @@ int smb2_ioctl(struct ksmbd_work *work) id = req->VolatileFileId; if (req->Flags != cpu_to_le32(SMB2_0_IOCTL_IS_FSCTL)) { - rsp->hdr.Status = STATUS_NOT_SUPPORTED; + ret = -EOPNOTSUPP; goto out; } @@ -7747,8 +7747,9 @@ int smb2_ioctl(struct ksmbd_work *work) case FSCTL_DFS_GET_REFERRALS: case FSCTL_DFS_GET_REFERRALS_EX: /* Not support DFS yet */ + ret = -EOPNOTSUPP; rsp->hdr.Status = STATUS_FS_DRIVER_REQUIRED; - goto out; + goto out2; case FSCTL_CREATE_OR_GET_OBJECT_ID: { struct file_object_buf_type1_ioctl_rsp *obj_buf; @@ -8038,8 +8039,10 @@ int smb2_ioctl(struct ksmbd_work *work) rsp->hdr.Status = STATUS_BUFFER_TOO_SMALL; else if (ret < 0 || rsp->hdr.Status == 0) rsp->hdr.Status = STATUS_INVALID_PARAMETER; + +out2: smb2_set_err_rsp(work); - return 0; + return ret; } /** -- 2.51.0