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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 26561C433FF for ; Wed, 14 Aug 2019 17:28:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA29B20665 for ; Wed, 14 Aug 2019 17:28:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565803699; bh=3hYd0RRYBbfAdBHINRX2Cp50Gclo48b009vT2VZQ0yY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=d0BuL8Lk7/hohAZzOwX0DqpzPRStolPTYMqNOf1eFjOIwJdNHV12DwVeyWyiODxWR dnkRhh7Y3+uDeBshzV1UEqhqqnlL590uchfzf5eCMmSlvF+ppqHcHWqrp73vhtqKrB LZRV3LQnJYXtA9QFIu31n3qFoym7T3/d030sOwo4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729242AbfHNR2S (ORCPT ); Wed, 14 Aug 2019 13:28:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:50882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726804AbfHNRCZ (ORCPT ); Wed, 14 Aug 2019 13:02:25 -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 DDEBA2173B; Wed, 14 Aug 2019 17:02:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802145; bh=3hYd0RRYBbfAdBHINRX2Cp50Gclo48b009vT2VZQ0yY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bSZP2xp2GLQF6MuAEtA1hK/WOhormIhylGQNAyi5pGuHftzpvYW1HZ1jh92SWSNe2 H6rGzwPd4gW8VdJiiJEM5yvp0+kSVeJ8G5PTQUW4TPs/jQpIGLvFy+Bw3WKYDgEU0m t9BJRWVm9T3A02ZJy6HXHbYTxUg/o86v6pZvmIAA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gary R Hook , Herbert Xu Subject: [PATCH 5.2 012/144] crypto: ccp - Fix oops by properly managing allocated structures Date: Wed, 14 Aug 2019 18:59:28 +0200 Message-Id: <20190814165800.440512872@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165759.466811854@linuxfoundation.org> References: <20190814165759.466811854@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Gary R Hook commit 25e44338321af545ab34243a6081c3f0fc6107d0 upstream. A plaintext or ciphertext length of 0 is allowed in AES, in which case no encryption occurs. Ensure that we don't clean up data structures that were never allocated. Fixes: 36cf515b9bbe2 ("crypto: ccp - Enable support for AES GCM on v5 CCPs") Cc: Signed-off-by: Gary R Hook Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/ccp/ccp-ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/crypto/ccp/ccp-ops.c +++ b/drivers/crypto/ccp/ccp-ops.c @@ -859,11 +859,11 @@ e_tag: ccp_dm_free(&final_wa); e_dst: - if (aes->src_len && !in_place) + if (ilen > 0 && !in_place) ccp_free_data(&dst, cmd_q); e_src: - if (aes->src_len) + if (ilen > 0) ccp_free_data(&src, cmd_q); e_aad: