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 C69C61C3C11 for ; Tue, 12 Aug 2025 18:50:44 +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=1755024644; cv=none; b=MHt5Ik8KqjoV4dseV3JSBSHF25JOpmokExX+UMtw4qVmnk/eZZf81EBTuzOvsxjGwee0sF5XCaO1q9OMJOowdFFxRv/5MwJmH8Q7MxPNpg/BBdHTlhBt6ERs1IxbkCD91RKz3HtTKDAYstnGuYa6b4hg279iBmm917DAFUj82Vc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755024644; c=relaxed/simple; bh=CziuQVh4iq7lLlvhoxXKN6Q55B4af9Mr5xTJrXqsevw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Sk+YZd4LsfyXg2K4PQbcutfXOoDcpIHHERK/Sx66fA8EJk5kCWDJXbhRsTP+EmRsfy0gMcLP0r4/pwxpC5d03vowk+EkOweWH0+TFNdGyXDGU0zxJ/nWsTTPHYEdMWqkwkFU5/yqz23Ku+XIuDyY1HUqMh5XNJ5szwp6HPv0co4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d3NC5XGk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="d3NC5XGk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66B7AC4CEF0; Tue, 12 Aug 2025 18:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755024644; bh=CziuQVh4iq7lLlvhoxXKN6Q55B4af9Mr5xTJrXqsevw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d3NC5XGkxlxhBgXjG+nupLkhtlhcnF7U98HF7jykASQZGzm7G35P988lF4mECqLgU sNupmWL8FMRwvVWkO1iUmaSZHvSQqzYobXIvP/WFj4n3rH5UHA04lIXvh/lpzPBA4D FKe299wpGQ0Z+YXeMNm67zi4xzV/ktorReV3rsuMl9OliVSABLcmIbhUHpAryaFYZs zWGfeQ0VYPN1fTMmlUT9uR/Wi3ikSAOl3cH8zy+7jjZqZVxkAmjgDnAldTQuRWvLYA gCr4tTYMTIoAVFuOAjVboPQfCh5fS3mAcXI7rJi3+2u9IA8dBScq5mURsVXToL4CzO 07WNlFQWCeAbA== From: Sasha Levin To: stable@vger.kernel.org Cc: Thorsten Blum , Namjae Jeon , Steve French , Sasha Levin Subject: [PATCH 6.15.y] smb: server: Fix extension string in ksmbd_extract_shortname() Date: Tue, 12 Aug 2025 14:50:40 -0400 Message-Id: <20250812185040.2028641-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <2025081241-bobsled-broiling-d341@gregkh> References: <2025081241-bobsled-broiling-d341@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Thorsten Blum [ Upstream commit 8e7d178d06e8937454b6d2f2811fa6a15656a214 ] In ksmbd_extract_shortname(), strscpy() is incorrectly called with the length of the source string (excluding the NUL terminator) rather than the size of the destination buffer. This results in "__" being copied to 'extension' rather than "___" (two underscores instead of three). Use the destination buffer size instead to ensure that the string "___" (three underscores) is copied correctly. Cc: stable@vger.kernel.org Fixes: e2f34481b24d ("cifsd: add server-side procedures for SMB3") Signed-off-by: Thorsten Blum Acked-by: Namjae Jeon Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/smb/server/smb_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/smb/server/smb_common.c b/fs/smb/server/smb_common.c index 425c756bcfb8..b23203a1c286 100644 --- a/fs/smb/server/smb_common.c +++ b/fs/smb/server/smb_common.c @@ -515,7 +515,7 @@ int ksmbd_extract_shortname(struct ksmbd_conn *conn, const char *longname, p = strrchr(longname, '.'); if (p == longname) { /*name starts with a dot*/ - strscpy(extension, "___", strlen("___")); + strscpy(extension, "___", sizeof(extension)); } else { if (p) { p++; -- 2.39.5