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 B8DEC2EBB94 for ; Tue, 12 Aug 2025 11:06:20 +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=1754996780; cv=none; b=EsCtNtHizn+QBZE62RflsM+GWQYRLjrTVs+pkh+9j4PA9njHL4QHwqihPEdghABgi1LKIQcP1jD84QFsY4kl0zLXc0GhHTdLI0JaLOD6iIH85yhg1kJLg9TdvoZ61F+/dZtPyOK7DMnpm8sbqQe5cCePsjihF/wAMSjy26Dphgw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754996780; c=relaxed/simple; bh=/AgEurOFFUHEVmDG211oycK+NoDgJMACjd2Xn1kpw7o=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=GpqeqniqSUEOfZf3vkknIw9b758y0EZzr+O+qcTR0QCXPSNTdK3oeaxcPsVuQVJTsJROV6+ha4ceL1g9ukThBT0cgNT5KFKmqWS/QMV5SjG0sSSf6uHE7GzruF1ckNSASBoG2/QNoL66z2Tn3NvrxmYuPhcWGGTNRCV7m3vAiK8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TaH3rQca; 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="TaH3rQca" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 092B9C4CEF0; Tue, 12 Aug 2025 11:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1754996780; bh=/AgEurOFFUHEVmDG211oycK+NoDgJMACjd2Xn1kpw7o=; h=Subject:To:Cc:From:Date:From; b=TaH3rQca+xsSjs3jZ2g9TAgXpOaZYQVQs+0k82TH2nYYgaAIy73thbguiNWB33D9c +kQyUO56rpLqDGpaGPg6GoD3U/5sw2J/1jw9rJy2z8Ebc6mriJNaDUpiHSModSyEVJ hFiDk6eovBkOzjm6UAQfIdg5Tl3zsVobrTDeaYPE= Subject: FAILED: patch "[PATCH] smb: server: Fix extension string in" failed to apply to 5.15-stable tree To: thorsten.blum@linux.dev,linkinjeon@kernel.org,stfrench@microsoft.com Cc: From: Date: Tue, 12 Aug 2025 13:06:11 +0200 Message-ID: <2025081211-chirping-aversion-8b66@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 8e7d178d06e8937454b6d2f2811fa6a15656a214 # git commit -s git send-email --to '' --in-reply-to '2025081211-chirping-aversion-8b66@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 8e7d178d06e8937454b6d2f2811fa6a15656a214 Mon Sep 17 00:00:00 2001 From: Thorsten Blum Date: Wed, 6 Aug 2025 03:03:49 +0200 Subject: [PATCH] smb: server: Fix extension string in ksmbd_extract_shortname() 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 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++;