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 X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E133C43381 for ; Fri, 22 Mar 2019 12:12:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D30FB2083D for ; Fri, 22 Mar 2019 12:12:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256724; bh=RZKieupcb+ixJX6DFH7+vjjBIeF5AxZqZt+1WHuh+80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=s0+2ju0J7noQ75u9uc5Pr173qqRYHOtPLXL46sbLHfNLwyhHJ6aZqOruc6QyewL1C RZi0lAjmxazg/EKli0g1v8Z8QwzqibVRRlE7fS5U/T9EwpyLOKT/F357DcFWkUGYk9 by8lK2GAzQ6gnV8uh9Av29kMyup0FkPhOr/xHJ2s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389576AbfCVMMD (ORCPT ); Fri, 22 Mar 2019 08:12:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:50176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388968AbfCVML5 (ORCPT ); Fri, 22 Mar 2019 08:11:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 439DA21934; Fri, 22 Mar 2019 12:11:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256716; bh=RZKieupcb+ixJX6DFH7+vjjBIeF5AxZqZt+1WHuh+80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iZdR28BxzrSqwNtycvT6ban1Vsz89MKWhVXDtPOwR7VOn0b9fQooAGjRBGh0mgSGp n/Kp4l7KV8Cg2690gi8SLKlylurf/AKyJbSnDqfkBbt16OApjNFBSSJWj7KnX++rmx Yrkk38mtI4mJ8ZpNqfo3R0iYe/gBEghEr8YuL/yI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hadar Gat , Gilad Ben-Yossef , Herbert Xu Subject: [PATCH 5.0 016/238] crypto: ccree - fix free of unallocated mlli buffer Date: Fri, 22 Mar 2019 12:13:55 +0100 Message-Id: <20190322111259.153058088@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111258.383569278@linuxfoundation.org> References: <20190322111258.383569278@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hadar Gat commit a49411959ea6d4915a9fd2a7eb5ba220e6284e9a upstream. In cc_unmap_aead_request(), call dma_pool_free() for mlli buffer only if an item is allocated from the pool and not always if there is a pool allocated. This fixes a kernel panic when trying to free a non-allocated item. Cc: stable@vger.kernel.org Signed-off-by: Hadar Gat Signed-off-by: Gilad Ben-Yossef Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/ccree/cc_buffer_mgr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/crypto/ccree/cc_buffer_mgr.c +++ b/drivers/crypto/ccree/cc_buffer_mgr.c @@ -614,10 +614,10 @@ void cc_unmap_aead_request(struct device hw_iv_size, DMA_BIDIRECTIONAL); } - /*In case a pool was set, a table was - *allocated and should be released - */ - if (areq_ctx->mlli_params.curr_pool) { + /* Release pool */ + if ((areq_ctx->assoc_buff_type == CC_DMA_BUF_MLLI || + areq_ctx->data_buff_type == CC_DMA_BUF_MLLI) && + (areq_ctx->mlli_params.mlli_virt_addr)) { dev_dbg(dev, "free MLLI buffer: dma=%pad virt=%pK\n", &areq_ctx->mlli_params.mlli_dma_addr, areq_ctx->mlli_params.mlli_virt_addr);