Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1155014ybt; Wed, 8 Jul 2020 23:23:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHsWavbF863m0gPlexQiPfMfOZojACeLjOhXGX3nMFWKt/W6hBU7SWtz7bFQup4RtwTx3t X-Received: by 2002:a17:906:69d3:: with SMTP id g19mr35826798ejs.402.1594275838359; Wed, 08 Jul 2020 23:23:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594275838; cv=none; d=google.com; s=arc-20160816; b=agvj8xnp34PiS9Wn8w1BvZoXTTjK4Npn2848uRQgHkCktmxGwh1r1Dvs4oyrXPss5G hsa+h+YLThCzeLo/N3ocWoNb08j6bdZqlB+t0C3gAaX9HrEbT6TSSnl9i22yopddfFpE emmmHlu2WgvzztwesXmKi/fAnxlSlluJTJKU8AIVRdR+OZYIzXrN8uptnZLk0X09sp28 4G5BrHD9DKs2mk0nU6nveRcGJ2MXuGm+e0HVviRjuYdZwvdcCeb4b2d5MU61e4Cw9CVn 91Htj4oAfehTYjMv5YNQGNbo5UlKn+FgsxXoS0UvlkKc8eM+m8E06l4BvZD0iHeiAsld U2rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=Sl81iM0J/lPABj/akhRyUQ0Bb6NMuzvB6SqKp+9RjQc=; b=Xvcdl1kez3eFPCaQJf/wEMi4Rr27gu92YdF74xaHANUY2q14Oi/11ohogein1+Iw6L ld8df7yXCUwLdWTokMPHo4C6s5Xu9+34cRVeRn+prTCEdVuGu2IaH+gTlEw8dPPY4epb vuaMGBqJrucEFJV9N/B/RuyuD/8FW7Le9qHT0x+dUNyPvVLlRcmr/VwNDDSJ0eM6s9Ln ceELkFlUSCy2jPKH2qJiDr54levbtADwl6TWkqd31BiKFlwfeJU06BqQU9o2njKslRuQ W3iX3L4/12TottZke/pH2+3hL5ppT/k5LLMYjTo6iHIv8h1VW2iuo8y3Qy3OoaYfZDU+ 3MDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b="MRNA0U4/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ci12si1357748ejb.448.2020.07.08.23.23.36; Wed, 08 Jul 2020 23:23:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b="MRNA0U4/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726602AbgGIGUM (ORCPT + 99 others); Thu, 9 Jul 2020 02:20:12 -0400 Received: from linux.microsoft.com ([13.77.154.182]:38036 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725787AbgGIGUG (ORCPT ); Thu, 9 Jul 2020 02:20:06 -0400 Received: from sequoia.work.tihix.com (162-237-133-238.lightspeed.rcsntx.sbcglobal.net [162.237.133.238]) by linux.microsoft.com (Postfix) with ESMTPSA id DDD7520B4908; Wed, 8 Jul 2020 23:20:04 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com DDD7520B4908 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1594275605; bh=Sl81iM0J/lPABj/akhRyUQ0Bb6NMuzvB6SqKp+9RjQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MRNA0U4/MUFYoNQh/1FfyKqfdTvCKZBn+66ULd8wq11Blxi25lvGPAtJDBWuwEPjl tR1H8crl0m6VtMbijXGucsB/D6oEU6YQHadiiz3WwkgCz/kvLuScyEzEcrJJpGY5L8 Stag4eucxD6oH3cAHDitYgbsEUFxjUKeolU5KVp4= From: Tyler Hicks To: Mimi Zohar , Dmitry Kasatkin Cc: James Morris , "Serge E . Hallyn" , Lakshmi Ramasubramanian , Prakhar Srivastava , linux-kernel@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v3 06/12] ima: Fail rule parsing when the KEY_CHECK hook is combined with an invalid cond Date: Thu, 9 Jul 2020 01:19:05 -0500 Message-Id: <20200709061911.954326-7-tyhicks@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200709061911.954326-1-tyhicks@linux.microsoft.com> References: <20200709061911.954326-1-tyhicks@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The KEY_CHECK function only supports the uid, pcr, and keyrings conditionals. Make this clear at policy load so that IMA policy authors don't assume that other conditionals are supported. Fixes: 5808611cccb2 ("IMA: Add KEY_CHECK func to measure keys") Signed-off-by: Tyler Hicks Reviewed-by: Lakshmi Ramasubramanian --- * v3 - Added Lakshmi's Reviewed-by - Adjust for the indentation change introduced in patch #4 * v2 - No change security/integrity/ima/ima_policy.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 1c64bd6f1728..81da02071d41 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -1023,6 +1023,13 @@ static bool ima_validate_rule(struct ima_rule_entry *entry) if (entry->action & ~(MEASURE | DONT_MEASURE)) return false; + if (entry->flags & ~(IMA_FUNC | IMA_UID | IMA_PCR | + IMA_KEYRINGS)) + return false; + + if (ima_rule_contains_lsm_cond(entry)) + return false; + break; default: return false; -- 2.25.1