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 2806A145B24; Tue, 27 Feb 2024 14:13:05 +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=1709043186; cv=none; b=HpmoIESDFmGlXzRHKN95BzYav3YG2jj/eCF00tCtqLP1K7t7c+BgqJYJGt2TS6fqvBzlarN7NZ4W5k5E4EmaNWLMv7i6Cv7iZTPFfm69ZjSs3WkpJ94Gi+lsGEs9Dc/X4lDTiAuvB/qL2xEG1n/f4KVjJzDhDk40lTAeWMrU2s4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709043186; c=relaxed/simple; bh=M1pPVoQu+WOkGDCVbwzGC9xcKcRyQbtg3jDnYy72dhA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NFO9ysRnELR9sXEIv1uEVA5/bKhh+HZ+eEibApHpNZONaZx1S1PAzr4wEcR4Vq/xIywZXrbwNclmcHpBHtYWEgm8eQ1m0bkjsGiL/0Nhd7OvyMLX0zj+7Y8HFAWhCx8MIZV3iVDvi3f5cYOKF71XV4Dj37hSwh/Dt4XKVZQt4s0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eVcofVQ9; 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="eVcofVQ9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37B96C43390; Tue, 27 Feb 2024 14:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709043185; bh=M1pPVoQu+WOkGDCVbwzGC9xcKcRyQbtg3jDnYy72dhA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eVcofVQ990Fd/HzxiE8ShFHvuUxg1t5A/Zsp7cAV8QqCw4EWVRlKuECqiQsxt90Pl X8w7Ok5c11s+UWBp7xX5S6Po22lXtKVHcC/VeQCVwBRez0LuMmK42Vqr/PUYKMlo+n 3dpyjUake1QYfe1kurDTCA/oAVXE/ambOavhJT3w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nathan Chancellor , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Tom Talpey , linux-cifs@vger.kernel.org, llvm@lists.linux.dev, Kees Cook , Steve French , Sasha Levin Subject: [PATCH 6.1 019/195] smb: Work around Clang __bdos() type confusion Date: Tue, 27 Feb 2024 14:24:40 +0100 Message-ID: <20240227131611.030143428@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131610.391465389@linuxfoundation.org> References: <20240227131610.391465389@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: linux-cifs@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: Kees Cook [ Upstream commit 8deb05c84b63b4fdb8549e08942867a68924a5b8 ] Recent versions of Clang gets confused about the possible size of the "user" allocation, and CONFIG_FORTIFY_SOURCE ends up emitting a warning[1]: repro.c:126:4: warning: call to '__write_overflow_field' declared with 'warning' attribute: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Wattribute-warning] 126 | __write_overflow_field(p_size_field, size); | ^ for this memset(): int len; __le16 *user; ... len = ses->user_name ? strlen(ses->user_name) : 0; user = kmalloc(2 + (len * 2), GFP_KERNEL); ... if (len) { ... } else { memset(user, '\0', 2); } While Clang works on this bug[2], switch to using a direct assignment, which avoids memset() entirely which both simplifies the code and silences the false positive warning. (Making "len" size_t also silences the warning, but the direct assignment seems better.) Reported-by: Nathan Chancellor Closes: https://github.com/ClangBuiltLinux/linux/issues/1966 [1] Link: https://github.com/llvm/llvm-project/issues/77813 [2] Cc: Steve French Cc: Paulo Alcantara Cc: Ronnie Sahlberg Cc: Shyam Prasad N Cc: Tom Talpey Cc: linux-cifs@vger.kernel.org Cc: llvm@lists.linux.dev Signed-off-by: Kees Cook Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/smb/client/cifsencrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/smb/client/cifsencrypt.c b/fs/smb/client/cifsencrypt.c index d0ac2648c0d61..d3d4cf6321fd5 100644 --- a/fs/smb/client/cifsencrypt.c +++ b/fs/smb/client/cifsencrypt.c @@ -444,7 +444,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, len = cifs_strtoUTF16(user, ses->user_name, len, nls_cp); UniStrupr(user); } else { - memset(user, '\0', 2); + *(u16 *)user = 0; } rc = crypto_shash_update(ses->server->secmech.hmacmd5, -- 2.43.0