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 1EC8CC7EE30 for ; Sun, 26 Feb 2023 14:47:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229841AbjBZOrj (ORCPT ); Sun, 26 Feb 2023 09:47:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229797AbjBZOra (ORCPT ); Sun, 26 Feb 2023 09:47:30 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEC4C13D43; Sun, 26 Feb 2023 06:46:52 -0800 (PST) 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 1EDB7B8068F; Sun, 26 Feb 2023 14:45:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0846C4339B; Sun, 26 Feb 2023 14:45:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677422748; bh=uWz/X985SxdYJil3gvKDScsqPZntTshRERdo9etL7+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SzlSi3rd+J6825ysLsaOLZ57dMq+Lp964BXW3SrfiuFVtti+3ENGvrA4bb7NsjwqH bruDOsHHB5+ijx/Aj2inMIEmXLZZdb60r7pefx6/4yFReX86L1fx3akfq/XadX9KLE SkAr7dQA7pMsYQAa0YGS5GZ+wkTYLKzJQa2gwA9d8xAAmUx6DpPYYnU82tFQDS+vqR tlPcInMrfuSHtKKNVib7owM72EUnlAu7QGebXDJCs4tmpj52sRnLc4A3yj2CiryjdP VAkY5TDaupq+RE8A5OHO/56R+D2tO+Kd1KdjjsUnikiwBw/dVgCVxB6fpJqnd/l5O3 6sOYDHF8PX8Ag== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kees Cook , Nathan Chancellor , Weili Qian , Zhou Wang , Herbert Xu , "David S. Miller" , linux-crypto@vger.kernel.org, Sasha Levin , ndesaulniers@google.com, llvm@lists.linux.dev Subject: [PATCH AUTOSEL 6.2 25/53] crypto: hisilicon: Wipe entire pool on error Date: Sun, 26 Feb 2023 09:44:17 -0500 Message-Id: <20230226144446.824580-25-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226144446.824580-1-sashal@kernel.org> References: <20230226144446.824580-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-kernel@vger.kernel.org From: Kees Cook [ Upstream commit aa85923a954e7704bc9d3847dabeb8540aa98d13 ] To work around a Clang __builtin_object_size bug that shows up under CONFIG_FORTIFY_SOURCE and UBSAN_BOUNDS, move the per-loop-iteration mem_block wipe into a single wipe of the entire pool structure after the loop. Reported-by: Nathan Chancellor Link: https://github.com/ClangBuiltLinux/linux/issues/1780 Cc: Weili Qian Cc: Zhou Wang Cc: Herbert Xu Cc: "David S. Miller" Cc: linux-crypto@vger.kernel.org Signed-off-by: Kees Cook Tested-by: Nathan Chancellor # build Link: https://lore.kernel.org/r/20230106041945.never.831-kees@kernel.org Signed-off-by: Sasha Levin --- drivers/crypto/hisilicon/sgl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/crypto/hisilicon/sgl.c b/drivers/crypto/hisilicon/sgl.c index 2b6f2281cfd6c..0974b00414050 100644 --- a/drivers/crypto/hisilicon/sgl.c +++ b/drivers/crypto/hisilicon/sgl.c @@ -124,9 +124,8 @@ struct hisi_acc_sgl_pool *hisi_acc_create_sgl_pool(struct device *dev, for (j = 0; j < i; j++) { dma_free_coherent(dev, block_size, block[j].sgl, block[j].sgl_dma); - memset(block + j, 0, sizeof(*block)); } - kfree(pool); + kfree_sensitive(pool); return ERR_PTR(-ENOMEM); } EXPORT_SYMBOL_GPL(hisi_acc_create_sgl_pool); -- 2.39.0