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 3B827191F6B; Wed, 3 Jul 2024 11:22:25 +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=1720005745; cv=none; b=XNGUoWhGJs4iVYe5Mi/O2ztp0O+vd3DvksmBl0FUsdLTZs7JsRm+kzikOBgcgnhlYaZbkF9AUxsC27ri5VZHKQwp6ZphmIO/DMMX/zO+Nxri4KdzsEYUAh9a2yrW4hBQ+DA8Lax4+vDzXyGcrK0NKJy+LZK0ucxQPyXno138Mbg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720005745; c=relaxed/simple; bh=Opit10aO9kyIW3pJvHnWUGZ1S9fowPWJpnHaT5jfkdg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hTaZzGJ5S/wInFcd0nd+JhNM+Ynp73JQC31OS85Kv30p+Myeh1IyPk1dmwsbUgeJZpX88EFlUpINfbvx3NENE5gd9kpvnP+9rGVqlQiCdh484eL55d6LN2vEATPhq1BJBVnFAn2CLkzR+dOLbQueD+icVYg0d9PCcHMGzeapHu8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2gohlg/U; 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="2gohlg/U" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABE5AC2BD10; Wed, 3 Jul 2024 11:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720005745; bh=Opit10aO9kyIW3pJvHnWUGZ1S9fowPWJpnHaT5jfkdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2gohlg/UdHYzThPSIOqpj/Cq0tnTLXJg7yI2shpbK1hHf2cqf3EPVFdhzlq/XX18O 6NgiJ0xKQLYi3XBkZdkqvFnacetEoHTpevbQp7NNCRYKk9ghkv4Skfk9fRoW3X6kSo Pz8U8AcAkejSNP9Z9GzJQ7mmuZmM74xu63lG+b9Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chenghai Huang , Herbert Xu , Sasha Levin Subject: [PATCH 5.15 151/356] crypto: hisilicon/sec - Fix memory leak for sec resource release Date: Wed, 3 Jul 2024 12:38:07 +0200 Message-ID: <20240703102918.816118386@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240703102913.093882413@linuxfoundation.org> References: <20240703102913.093882413@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chenghai Huang [ Upstream commit bba4250757b4ae1680fea435a358d8093f254094 ] The AIV is one of the SEC resources. When releasing resources, it need to release the AIV resources at the same time. Otherwise, memory leakage occurs. The aiv resource release is added to the sec resource release function. Signed-off-by: Chenghai Huang Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/hisilicon/sec2/sec_crypto.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c index 0d26eda36a526..28c167e1be426 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.c +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c @@ -463,8 +463,10 @@ static void sec_alg_resource_free(struct sec_ctx *ctx, if (ctx->pbuf_supported) sec_free_pbuf_resource(dev, qp_ctx->res); - if (ctx->alg_type == SEC_AEAD) + if (ctx->alg_type == SEC_AEAD) { sec_free_mac_resource(dev, qp_ctx->res); + sec_free_aiv_resource(dev, qp_ctx->res); + } } static int sec_create_qp_ctx(struct hisi_qm *qm, struct sec_ctx *ctx, -- 2.43.0