From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:47114 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751796AbeAYL4v (ORCPT ); Thu, 25 Jan 2018 06:56:51 -0500 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w0PBs63m066023 for ; Thu, 25 Jan 2018 06:56:51 -0500 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0b-001b2d01.pphosted.com with ESMTP id 2fqef6gs75-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 25 Jan 2018 06:56:50 -0500 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 25 Jan 2018 11:56:48 -0000 Subject: Re: [RFC PATCH v3 2/2] ima: force re-appraisal on filesystems with FS_IMA_NO_CACHE From: Mimi Zohar To: "Serge E. Hallyn" , Alban Crequy Cc: alban@kinvolk.io, dongsu@kinvolk.io, iago@kinvolk.io, linux-kernel@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-fsdevel@vger.kernel.org, miklos@szeredi.hu, viro@zeniv.linux.org.uk, dmitry.kasatkin@gmail.com, james.l.morris@oracle.com, seth.forshee@canonical.com, hch@infradead.org Date: Thu, 25 Jan 2018 06:56:41 -0500 In-Reply-To: <20180124175234.GA29811@mail.hallyn.com> References: <20180122162452.8756-1-alban@kinvolk.io> <20180122162452.8756-3-alban@kinvolk.io> <20180124175234.GA29811@mail.hallyn.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Message-Id: <1516881401.3751.37.camel@linux.vnet.ibm.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: > > @@ -228,9 +229,28 @@ static int process_measurement(struct file *file, char *buf, loff_t size, > > IMA_APPRAISE_SUBMASK | IMA_APPRAISED_SUBMASK | > > IMA_ACTION_FLAGS); > > > > - if (test_and_clear_bit(IMA_CHANGE_XATTR, &iint->atomic_flags)) > > - /* reset all flags if ima_inode_setxattr was called */ > > + /* > > + * Reset the measure, appraise and audit cached flags either if: > > + * - ima_inode_setxattr was called, or > > + * - based on filesystem feature flag > > + * forcing the file to be re-evaluated. > > + */ > > + if (test_and_clear_bit(IMA_CHANGE_XATTR, &iint->atomic_flags)) { > > iint->flags &= ~IMA_DONE_MASK; > > + } else if (inode->i_sb->s_type->fs_flags & FS_IMA_NO_CACHE) { > > + if (action & IMA_MEASURE) { > > + iint->measured_pcrs = 0; > > + iint->flags &= > > + ~(IMA_COLLECTED | IMA_MEASURE | IMA_MEASURED); > > + } > > + if (action & IMA_APPRAISE) > > + iint->flags &= > > + ~(IMA_COLLECTED | IMA_APPRAISE | IMA_APPRAISED | > > + IMA_APPRAISE_SUBMASK | IMA_APPRAISED_SUBMASK); > > + if (action & IMA_AUDIT) > > + iint->flags &= > > + ~(IMA_COLLECTED | IMA_AUDIT | IMA_AUDITED); > > + } > > Alban, I don't know what I was thinking, but this can be simplified like for the IMA_CHANGE_XATTR case.  Except in the IMA_CHANGE_XATTR case, "measured_pcrs" was already reset, whereas in this case "measured_pcrs" needs to be reset. Mimi