From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0C5DC25B0F for ; Sun, 14 Aug 2022 16:36:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242743AbiHNQgd (ORCPT ); Sun, 14 Aug 2022 12:36:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243000AbiHNQgM (ORCPT ); Sun, 14 Aug 2022 12:36:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78E97459B2; Sun, 14 Aug 2022 09:28:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2103AB80B7C; Sun, 14 Aug 2022 16:28:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 110CEC433D6; Sun, 14 Aug 2022 16:28:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660494499; bh=pr4GpRToBJONOYmLbcX8Okfc8+U2+Ypy9bPPWkcUgBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LD+/6+QsrJbONZY4jcN3kVwByi96euacyROWi2He7DVzn6w/nCQ1qOfUka4Xx9Bor f3yi7OBun4aSLnzjeAScZBFZkfn/m2AF8UJ+XXGVSnR81nyU054w9hkMQ77ry1No+5 79D7mvEf1zcVhEAkSEXzLVUjBQ+FmxMGX6PWjn/u9USev4BohnDTpq5Dkgsuupg+fV KUOVxjoNrRhHSs/wtggp7RZ4nXs8xJKa+hODZLydLZdQKy9Vfp4QD/MPeA+XaXOo1r i2DfEoAh4NWUq9TSOQU/4/zKAfTj1wfAdpO+aF/Oyv1DXufroD10FF4S4U+p8zRNs/ l7WAvjnN/pFUQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Steve French , Ronnie Sahlberg , Sasha Levin , sfrench@samba.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org Subject: [PATCH AUTOSEL 5.10 16/19] smb3: check xattr value length earlier Date: Sun, 14 Aug 2022 12:27:35 -0400 Message-Id: <20220814162739.2398217-16-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814162739.2398217-1-sashal@kernel.org> References: <20220814162739.2398217-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org From: Steve French [ Upstream commit 5fa2cffba0b82336a2244d941322eb1627ff787b ] Coverity complains about assigning a pointer based on value length before checking that value length goes beyond the end of the SMB. Although this is even more unlikely as value length is a single byte, and the pointer is not dereferenced until laterm, it is clearer to check the lengths first. Addresses-Coverity: 1467704 ("Speculative execution data leak") Reviewed-by: Ronnie Sahlberg Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/cifs/smb2ops.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index b855abfaaf87..b6d72e3c5eba 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -1000,9 +1000,7 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size, size_t name_len, value_len, user_name_len; while (src_size > 0) { - name = &src->ea_data[0]; name_len = (size_t)src->ea_name_length; - value = &src->ea_data[src->ea_name_length + 1]; value_len = (size_t)le16_to_cpu(src->ea_value_length); if (name_len == 0) @@ -1014,6 +1012,9 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size, goto out; } + name = &src->ea_data[0]; + value = &src->ea_data[src->ea_name_length + 1]; + if (ea_name) { if (ea_name_len == name_len && memcmp(ea_name, name, name_len) == 0) { -- 2.35.1