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 3738C348875; Tue, 6 Jan 2026 17:18:01 +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=1767719882; cv=none; b=Z6xMgaz+4HIr/OaG10/zvb06KJFKSlWUt7lJKhyXNq6vuhN713n+DBZzQotBY230evXklKro2Nhb2rpQcz16wLnruHaa9msoKcz8LwxafMTdSfpWGmxcVbXmRbzhdh63IKkFZYweEIdaitM1Mk9ZO3MErEulH6M3fvapCVTAf78= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767719882; c=relaxed/simple; bh=radEEhl6lmmfS39ndYA12aTfFqhZiZFUlo1RffYh4NU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eacaGv8wQIL9GC6/Ser0XltTBRceAk8uz/QH8Mx7qYWCOsgWFHzrMV0pV2kwkiVIcDr4CaeSkMlz0SChBoDZet9+0gnhx9lSihMiad/VSMhMT90alw9bgzNnNuRdRldkBzMGRWf1oJXDsVLDfe2rtNKIeaM/qasaOKR8+IBhbDs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rYGVvRE0; 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="rYGVvRE0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4632EC116C6; Tue, 6 Jan 2026 17:18:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767719881; bh=radEEhl6lmmfS39ndYA12aTfFqhZiZFUlo1RffYh4NU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rYGVvRE0ygNG+fPqJRf+P+FFclra1Wd2PHyoGoaV1k193Ox3izXdSOkCgI5FHKAK+ czUwlTOLJyBGMPHwEL7NR/nvKSrBJlDA9dBjAPEguNkwIgKHEvwkuCfzXVuAWB3U5G U43TMZdin9+iuQUByv5m3Dj82/iykwKno8NkIsjU= 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.12 036/567] smb/server: fix return value of smb2_ioctl() Date: Tue, 6 Jan 2026 17:56:58 +0100 Message-ID: <20260106170452.675969408@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260106170451.332875001@linuxfoundation.org> References: <20260106170451.332875001@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.12-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 cd42d25812661..d9e28191c267e 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -8107,7 +8107,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; } @@ -8127,8 +8127,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; @@ -8418,8 +8419,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