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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 04BDBC352AA for ; Tue, 1 Oct 2019 16:58:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF6512168B for ; Tue, 1 Oct 2019 16:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569949132; bh=uOi64M7D10KweumGcEk7pWtgTYT8TAKC8lUsJlYhmAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PTIE7+toVD35+qgNFKoTU2LWn28kFW6FIeuuhggDcQ8LICRx68swqoUW7pJVU8X5Q m+LTaKgD4SOjGE0CPvy+6WdQBp0M7gVIXeP3xRFUmy78e2559xuXo8zz2dWn4fzv7R ovb2yB0jGry5kgyRS4rGzq7SpgHA6fSnBf9omyKQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726067AbfJAQ6w (ORCPT ); Tue, 1 Oct 2019 12:58:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:53076 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731038AbfJAQla (ORCPT ); Tue, 1 Oct 2019 12:41:30 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 010CD20B7C; Tue, 1 Oct 2019 16:41:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569948089; bh=uOi64M7D10KweumGcEk7pWtgTYT8TAKC8lUsJlYhmAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qj8aOhpYRr3/bmwrgDC26TN2gYAnXM1YVej2E2ycGd0dwgLdGC9hDaJ9IWGnSGCq5 RXVMDycHcGdTbb1p77ST7zubPsKfcg52uXE6086gHY3XGietrP00MrQlumqYrdidc1 HWxnVNXLKlr+MGX3p8p+FE9xoiPfLtjdp0IELn5k= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sascha Hauer , Mimi Zohar , Sasha Levin , linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 03/63] ima: fix freeing ongoing ahash_request Date: Tue, 1 Oct 2019 12:40:25 -0400 Message-Id: <20191001164125.15398-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191001164125.15398-1-sashal@kernel.org> References: <20191001164125.15398-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Sascha Hauer [ Upstream commit 4ece3125f21b1d42b84896c5646dbf0e878464e1 ] integrity_kernel_read() can fail in which case we forward to call ahash_request_free() on a currently running request. We have to wait for its completion before we can free the request. This was observed by interrupting a "find / -type f -xdev -print0 | xargs -0 cat 1>/dev/null" with ctrl-c on an IMA enabled filesystem. Signed-off-by: Sascha Hauer Signed-off-by: Mimi Zohar Signed-off-by: Sasha Levin --- security/integrity/ima/ima_crypto.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c index 7532b062be594..73044fc6a9521 100644 --- a/security/integrity/ima/ima_crypto.c +++ b/security/integrity/ima/ima_crypto.c @@ -271,6 +271,11 @@ static int ima_calc_file_hash_atfm(struct file *file, if (rc != rbuf_len) { if (rc >= 0) rc = -EINVAL; + /* + * Forward current rc, do not overwrite with return value + * from ahash_wait() + */ + ahash_wait(ahash_rc, &wait); goto out3; } -- 2.20.1