From patchwork Sun Jan 7 12:14:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 123657 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1548328qgn; Sun, 7 Jan 2018 04:17:53 -0800 (PST) X-Google-Smtp-Source: ACJfBotx7INQdqqRg3Bg3oYHuoOQ4nyyTinmM5p8PnH/VwhhFJzQtEdhFhct7hEn7RKvXCCihgUE X-Received: by 10.101.71.205 with SMTP id f13mr7169764pgs.411.1515327473167; Sun, 07 Jan 2018 04:17:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515327473; cv=none; d=google.com; s=arc-20160816; b=tytsOzb9zzWz6bOCz5/tZvi6eY2RVZm/XjGKriGQkglvkmtwJ7wjAYITPHhzuGs/te F7zJ6WMSYBrkcBlL16XiAPbxIdMVLN8mhpNrfQAA8qrr28psCxJ+Nx7P2Y6jn0H0dbKQ bDfyHET1RAPPQVX+fqrM3nwMZe+jfNc0W2xWltC2CBoIoofq7XVgDGFAcIhBbCRMZAjq /MW1pJkKMJYGeERQNEIbNXVxAicAZh7sjhiHm7glS4w7U/PM8TNvzPlkDg67y/vAoeIh ew4n1rEQh0cYE+J9O9EuKOPoRTX2aX663Dp1QmjFVlKiCvtMCX/iP9fT/BhIXE3DiMpa C/BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=TA0VYmepL2AjhZ24BnOEerRWAyGxxfoATYElf6fI6S0=; b=i6duoVLoADVStEoe7m0Tof2DwPeJMNZZaCj1IixhNo/BMy+4H88676ikmCYJqoLmEc Drmy+qpWMNn8LbRdaGKKbzHUPi9hpPUwzd0Coglf5ZElBzXu5fUAW0zSFnAWu/JY934z OGyPF/hdwpsYPQ9zm/Z9RyOuqpagwX/rffLrlVw+NddiysbEp9nLjrpOmrDWXTcldF12 QA6pRghaLtuDrJQZxKyjPYtdom//bh+tMJ2PY0yivHTZJQFXTZ/7o82fpb+rKA96QehV lnATWZxEQFZWOfPM8tT2NVq3ELWDLbcUsPMrjlXzUeoRu/pKfBQd4crDGcZPRc5AKQWm d+Zw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q7si2127365pfh.17.2018.01.07.04.17.52; Sun, 07 Jan 2018 04:17:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754026AbeAGMRv (ORCPT + 28 others); Sun, 7 Jan 2018 07:17:51 -0500 Received: from foss.arm.com ([217.140.101.70]:57518 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753826AbeAGMRs (ORCPT ); Sun, 7 Jan 2018 07:17:48 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 985711435; Sun, 7 Jan 2018 04:17:48 -0800 (PST) Received: from localhost.localdomain (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 88A543F581; Sun, 7 Jan 2018 04:17:46 -0800 (PST) From: Gilad Ben-Yossef To: Greg Kroah-Hartman Cc: Ofir Drang , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org Subject: [PATCH v3 13/27] staging: ccree: check DMA pool buf !NULL before free Date: Sun, 7 Jan 2018 12:14:24 +0000 Message-Id: <1515327285-8948-14-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515327285-8948-1-git-send-email-gilad@benyossef.com> References: <1515327285-8948-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If we ran out of DMA pool buffers, we get into the unmap code path with a NULL before. Deal with this by checking the virtual mapping is not NULL. Cc: stable@vger.kernel.org Signed-off-by: Gilad Ben-Yossef --- drivers/staging/ccree/ssi_buffer_mgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/staging/ccree/ssi_buffer_mgr.c b/drivers/staging/ccree/ssi_buffer_mgr.c index e85bb53..78288ed 100644 --- a/drivers/staging/ccree/ssi_buffer_mgr.c +++ b/drivers/staging/ccree/ssi_buffer_mgr.c @@ -465,7 +465,8 @@ void cc_unmap_blkcipher_request(struct device *dev, void *ctx, DMA_TO_DEVICE); } /* Release pool */ - if (req_ctx->dma_buf_type == CC_DMA_BUF_MLLI) { + if (req_ctx->dma_buf_type == CC_DMA_BUF_MLLI && + req_ctx->mlli_params.mlli_virt_addr) { dma_pool_free(req_ctx->mlli_params.curr_pool, req_ctx->mlli_params.mlli_virt_addr, req_ctx->mlli_params.mlli_dma_addr);