Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp3556389iog; Mon, 27 Jun 2022 19:55:21 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sVCa+H/xqw8luexA6BNfgtpcIwWDKfyKD52O/KHm3N5MqtDaOXFwZC5c6QSQEyyVuy/sQ2 X-Received: by 2002:a05:6402:2684:b0:435:dcaf:29b3 with SMTP id w4-20020a056402268400b00435dcaf29b3mr20852960edd.358.1656384921315; Mon, 27 Jun 2022 19:55:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656384921; cv=none; d=google.com; s=arc-20160816; b=C2rVRUrEZH/HeKf7GXHnhrgZ31dbocymd7qUrrGbZSkBE05DskO24nUCTms2TiCfth oJMtqsZY7M/o8c7twkueR53h1flYE3/tm8C7WhvtFRA4Z3bjSZtoX0VCu3gLtryuEC6h aEeQe1M97i5HjYyFMa5bMiTtXQa0S6cvRn7t39GjAIelGNj6mNZRoR5p96ACz8DfkE7R rZnQDe0lyaL0/aYGi6n9tnWAX2kzM2TIAc86S2/0ypy8zmI+yh3Pi6qWQy+DKPaFb8EK P+7HFNqO46Y7K5eK6vifdeM+MFliU0/ZsZlwC0+Ea61na9TmoFuAlk3N+uZiG4WD74AD xrRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TkghTQ81pkojL0hUymEO4XZ5LCifRtp7Qn8dOo2RY8Y=; b=XmgJmXUTeltxn2U/rj8+h7Ovbal82jl/oUVkqv5/WM607L0ElDQHuhSiXqyPm64nTl NNM/qbSIVXQ+pt9k5EqTlJUOWw6yDEoPOiiGlsaTANWpC08WD8sE8p1D3J0ewTi7vBlH cSaioK8JYZDOVvyDKH2o8VaxlaAWJkztfIB9bpUiSNz8xwglYAUdGXDkTVC7TSB73Cj2 cFG8hvZXJIcnrHEahoYGoFunZ9Op16dY283f0qTMEONGN+UF3jTlew+mBDJSvyWTeskc NnAxhxJtpiftTmAVUXr4fjwjWT7QM4DroJsUwctWaGZ3UrAdRAyZeEFCWhdvapYh8a3u c52w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FytOubyi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g8-20020a170906868800b007262d20ea70si10316378ejx.85.2022.06.27.19.54.56; Mon, 27 Jun 2022 19:55:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FytOubyi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244310AbiF1CYi (ORCPT + 99 others); Mon, 27 Jun 2022 22:24:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244121AbiF1CXC (ORCPT ); Mon, 27 Jun 2022 22:23:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E19BF24BC1; Mon, 27 Jun 2022 19:22:32 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 5BC36617D4; Tue, 28 Jun 2022 02:22:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8839C34115; Tue, 28 Jun 2022 02:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656382951; bh=uhhm1hQwl9GEenymTrnKlp8FI+WMSqOom27CaC4a0TE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FytOubyi8kx1X0BhRQZaPpcIwxEJbmswkAWLVcDvV+dxXkWi3K4i6sq29f4BQ753J wbetYaIc/W68lo2CjBXvQ1mC1zajx/YhH1ZhHRKmSj4Cymr9cwEtDtGYZIWWoh+vng 1LlIQjHyRBdQWQTQGZlsNqxySNEOflWliZa+1ADt6Vi0Fib0JZB4UoOQf3rs/TWl3G NmRvPxnuuJ3qf1c/tU4B1jIbZiPtJjgovuILtdH23+NKZXDHy/XNIR7dT3qzH+/7iB CRsUyjZRKqOe5l60y4LTQ/mca5JXZ5EKRdG/nT71fOvUJcwkzdve3M8rr1a/6nnAgn GZjPnnT0FFiFQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kees Cook , Nick Desaulniers , Tom Rix , llvm@lists.linux.dev, "Gustavo A . R . Silva" , Nathan Chancellor , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, leon@kernel.org, jiri@nvidia.com, olteanv@gmail.com, simon.horman@corigine.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 37/41] hinic: Replace memcpy() with direct assignment Date: Mon, 27 Jun 2022 22:20:56 -0400 Message-Id: <20220628022100.595243-37-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220628022100.595243-1-sashal@kernel.org> References: <20220628022100.595243-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kees Cook [ Upstream commit 1e70212e031528918066a631c9fdccda93a1ffaa ] Under CONFIG_FORTIFY_SOURCE=y and CONFIG_UBSAN_BOUNDS=y, Clang is bugged here for calculating the size of the destination buffer (0x10 instead of 0x14). This copy is a fixed size (sizeof(struct fw_section_info_st)), with the source and dest being struct fw_section_info_st, so the memcpy should be safe, assuming the index is within bounds, which is UBSAN_BOUNDS's responsibility to figure out. Avoid the whole thing and just do a direct assignment. This results in no change to the executable code. [This is a duplicate of commit 2c0ab32b73cf ("hinic: Replace memcpy() with direct assignment") which was applied to net-next.] Cc: Nick Desaulniers Cc: Tom Rix Cc: llvm@lists.linux.dev Link: https://github.com/ClangBuiltLinux/linux/issues/1592 Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Tested-by: Nathan Chancellor # build Link: https://lore.kernel.org/r/20220616052312.292861-1-keescook@chromium.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_devlink.c b/drivers/net/ethernet/huawei/hinic/hinic_devlink.c index 6e11ee339f12..92d4e0039565 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_devlink.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_devlink.c @@ -43,9 +43,7 @@ static bool check_image_valid(struct hinic_devlink_priv *priv, const u8 *buf, for (i = 0; i < fw_image->fw_info.fw_section_cnt; i++) { len += fw_image->fw_section_info[i].fw_section_len; - memcpy(&host_image->image_section_info[i], - &fw_image->fw_section_info[i], - sizeof(struct fw_section_info_st)); + host_image->image_section_info[i] = fw_image->fw_section_info[i]; } if (len != fw_image->fw_len || -- 2.35.1