Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3750219pxv; Mon, 5 Jul 2021 04:59:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxj2H9PtEPYNB/xajGtATkeLtwTGPe6noZ3PLMY5HpHwiKD/JVShCmYYJX9A+rsUH3GyV3z X-Received: by 2002:a05:6638:3896:: with SMTP id b22mr12293884jav.37.1625486341666; Mon, 05 Jul 2021 04:59:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625486341; cv=none; d=google.com; s=arc-20160816; b=FO5SxKQZO5IzxT48Nuuzanu0gVvFVdC/tm0nSgGTmIfkU4kCYLeC3imB81WIdGukQo nBYFPbWg9Om6hmARjzSJye6oA9mw/zj26Z/PtSBFmPoFo8KO/HdyUj4h8lI1p6Tj3tBd Mqag+0MWkx8sbvohFdjPT3BtpXl/+tYJ/weaYBRrhXjqwtukZlP7URgoJfsnUjw+KrL5 NK7X38MKuMbdGzEs+dSzmqj+0uwdjNYv8+RHH6KbMZcf3EvzlFolYudMGLa6TubSyke/ nwPSo9mz45JHFlYG4EvfrMbT6UelMp7mrLqdRK9BTyBz5vCl2dpWDXxzxBO0PvJDsRkN 5Vlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=/W2SdWYkCvSK2iBDR1ZYSoOX+y4xPoJVJJH+SzK//KA=; b=FD27BcR4hA7CJk6tD+PQnbR8vRrPHsZ3POOXQnXPCPcEsgpoz55F0bUK6C7Z4RanU6 0c1Ku42dE03CjDpDPGOUfP4RKrdJ9TqnItKXy8kvj25okG9H//4UecIiX6uxuMGuKnjQ EMg+0Lua/oRz2y8BBKdx+8P80/c2kzENYmkoHo5RzsoLKvAEBlMdZuBODJBZO+8f3n/H DFDOoFaS/N2gVb2KdvjQ8KNiekLLp78/M2Aw06FblH7gveTQ3H3SvBr3uXC7P2bi3tUb 7uxNK/6sv6AcRn3Lt6t9qOd+aAYUqwbiR6bf41ppM7iOc5f84mukftUj/MgqkUsKr+/D Y8ag== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s4si10930455jam.58.2021.07.05.04.58.50; Mon, 05 Jul 2021 04:59:01 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231127AbhGEL7s (ORCPT + 99 others); Mon, 5 Jul 2021 07:59:48 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3363 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230174AbhGEL7s (ORCPT ); Mon, 5 Jul 2021 07:59:48 -0400 Received: from fraeml714-chm.china.huawei.com (unknown [172.18.147.200]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4GJP9H6rq4z6FC66; Mon, 5 Jul 2021 19:49:07 +0800 (CST) Received: from roberto-ThinkStation-P620.huawei.com (10.204.63.22) by fraeml714-chm.china.huawei.com (10.206.15.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 5 Jul 2021 13:57:09 +0200 From: Roberto Sassu To: CC: , , , , , Roberto Sassu Subject: [PATCH] ima: Support euid keyword for buffer measurement Date: Mon, 5 Jul 2021 13:56:50 +0200 Message-ID: <20210705115650.3373599-1-roberto.sassu@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.204.63.22] X-ClientProxiedBy: lhreml751-chm.china.huawei.com (10.201.108.201) To fraeml714-chm.china.huawei.com (10.206.15.33) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch makes the 'euid' keyword available for buffer measurement rules, in the same way as for other rules. Currently, there is only support for the 'uid' keyword. With this change, buffer measurement (or non-measurement) can depend also on the process effective UID. Signed-off-by: Roberto Sassu --- security/integrity/ima/ima_policy.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index fd5d46e511f1..fdaa030fb04b 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -480,6 +480,16 @@ static bool ima_match_rule_data(struct ima_rule_entry *rule, if ((rule->flags & IMA_UID) && !rule->uid_op(cred->uid, rule->uid)) return false; + if (rule->flags & IMA_EUID) { + if (has_capability_noaudit(current, CAP_SETUID)) { + if (!rule->uid_op(cred->euid, rule->uid) + && !rule->uid_op(cred->suid, rule->uid) + && !rule->uid_op(cred->uid, rule->uid)) + return false; + } else if (!rule->uid_op(cred->euid, rule->uid)) + return false; + } + switch (rule->func) { case KEY_CHECK: if (!rule->keyrings) @@ -1153,7 +1163,7 @@ 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 | + if (entry->flags & ~(IMA_FUNC | IMA_UID | IMA_EUID | IMA_PCR | IMA_LABEL)) return false; -- 2.25.1