From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751878AbeAYL44 (ORCPT ); Thu, 25 Jan 2018 06:56:56 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:56178 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751802AbeAYL4w (ORCPT ); Thu, 25 Jan 2018 06:56:52 -0500 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" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 18012511-0040-0000-0000-00000408ACD4 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18012511-0041-0000-0000-0000260C35E1 Message-Id: <1516881401.3751.37.camel@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-01-25_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1801250163 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > > @@ -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