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 E32BCC433DF for ; Fri, 19 Jun 2020 15:12:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B0937218AC for ; Fri, 19 Jun 2020 15:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579568; bh=6TsHBHViMxGSDpUMbr2WnHgOkzv/alEPA2hr4wMcx1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wkdUjeQm8sRkZezZfriloskv73QrJeugikwCYbKrLylY3T5ZhXTH0nzVTkmqoGd73 6j735ZZOejLb/XkAACKSCU2zwxpUuhmKg28G/Y1wDb0oIokB5dthmj1xczav5u0GER coGlB9Zgj5MdEMKipKNCNB89Aka6nhc4LqudLgH8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403937AbgFSPMr (ORCPT ); Fri, 19 Jun 2020 11:12:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:43146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403925AbgFSPMi (ORCPT ); Fri, 19 Jun 2020 11:12:38 -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 70D3A21582; Fri, 19 Jun 2020 15:12:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579557; bh=6TsHBHViMxGSDpUMbr2WnHgOkzv/alEPA2hr4wMcx1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WMKCxeaWv50MNJcCwb4xey/AzMJtP2rTCn5O4jWAr6fAxM8Ue6JWZ8G9T1On+mIGa bQTGq0/mUSWkKnzyBFr5gH3ohCIcdA7P9mSqJ9Mh1McC3ajIrxTnXeKUzGDRFsriEc kNLuGMJQGhYUclh8X70pkpVEhTrQ9fPJ3N27s/W0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Roberto Sassu , Mimi Zohar Subject: [PATCH 5.4 180/261] evm: Fix possible memory leak in evm_calc_hmac_or_hash() Date: Fri, 19 Jun 2020 16:33:11 +0200 Message-Id: <20200619141658.550296463@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141649.878808811@linuxfoundation.org> References: <20200619141649.878808811@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: Roberto Sassu commit 0c4395fb2aa77341269ea619c5419ea48171883f upstream. Don't immediately return if the signature is portable and security.ima is not present. Just set error so that memory allocated is freed before returning from evm_calc_hmac_or_hash(). Fixes: 50b977481fce9 ("EVM: Add support for portable signature format") Signed-off-by: Roberto Sassu Cc: stable@vger.kernel.org Signed-off-by: Mimi Zohar Signed-off-by: Greg Kroah-Hartman --- security/integrity/evm/evm_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/security/integrity/evm/evm_crypto.c +++ b/security/integrity/evm/evm_crypto.c @@ -243,7 +243,7 @@ static int evm_calc_hmac_or_hash(struct /* Portable EVM signatures must include an IMA hash */ if (type == EVM_XATTR_PORTABLE_DIGSIG && !ima_present) - return -EPERM; + error = -EPERM; out: kfree(xattr_value); kfree(desc);