From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44E37CDB47E for ; Wed, 11 Oct 2023 19:02:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233215AbjJKTCD (ORCPT ); Wed, 11 Oct 2023 15:02:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233052AbjJKTCC (ORCPT ); Wed, 11 Oct 2023 15:02:02 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB00894; Wed, 11 Oct 2023 12:02:00 -0700 (PDT) Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39BJ0dbo019376; Wed, 11 Oct 2023 19:01:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : subject : from : to : cc : date : in-reply-to : references : content-type : mime-version : content-transfer-encoding; s=pp1; bh=EvSrdzgQac9t6SDpr7YjTWUuBILcaWDNXy2FILzX1wo=; b=L2qDpLDc/2g1BpFRswBB+qQrSm0VpZhL5KHen0nqiBrxOiWlGYxmSX35WngizvVOuidR ZyUyzJPUGUwJlFtCXsH4NKLsJp4PY15cJAxyUYNMd1KLz4ymyHsncfHRMu+5Vvx/P3qP ZWYAbXulJxpsudI2b5HyAEvO6cI/r4NBi/X1VYth35A6S7bZcq1nU026uRfg8z7MkqUE qY4AZwTAm0VdD98AEIuV/reOJ+JMgzwPgDcEjTUxPODSh84h3kkV02xCzoAdCpNQd9gf DvXN6iyJa2pH4wckhUzEKBkyas4pS6qtouqFkQ0gYS7oDZDHPTneZRfZ8+9M74nCOMUL mA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3tp1540vb3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Oct 2023 19:01:15 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 39BJ1DYR024658; Wed, 11 Oct 2023 19:01:14 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3tp1540vac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Oct 2023 19:01:13 +0000 Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 39BHKjAT023000; Wed, 11 Oct 2023 19:01:12 GMT Received: from smtprelay06.wdc07v.mail.ibm.com ([172.16.1.73]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3tkmc1sspt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Oct 2023 19:01:12 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 39BJ1BgF21758490 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 11 Oct 2023 19:01:11 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 626625803F; Wed, 11 Oct 2023 19:01:11 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ECC4558064; Wed, 11 Oct 2023 19:01:09 +0000 (GMT) Received: from li-f45666cc-3089-11b2-a85c-c57d1a57929f.watson.ibm.com (unknown [9.31.99.90]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Wed, 11 Oct 2023 19:01:09 +0000 (GMT) Message-ID: <8646e30b0074a2932076b5a0a792b14be034de98.camel@linux.ibm.com> Subject: Re: [PATCH v3 02/25] ima: Align ima_post_path_mknod() definition with LSM infrastructure From: Mimi Zohar To: Roberto Sassu , viro@zeniv.linux.org.uk, brauner@kernel.org, chuck.lever@oracle.com, jlayton@kernel.org, neilb@suse.de, kolga@netapp.com, Dai.Ngo@oracle.com, tom@talpey.com, dmitry.kasatkin@gmail.com, paul@paul-moore.com, jmorris@namei.org, serge@hallyn.com, dhowells@redhat.com, jarkko@kernel.org, stephen.smalley.work@gmail.com, eparis@parisplace.org, casey@schaufler-ca.com Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, keyrings@vger.kernel.org, selinux@vger.kernel.org, Roberto Sassu Date: Wed, 11 Oct 2023 15:01:09 -0400 In-Reply-To: References: <20230904133415.1799503-1-roberto.sassu@huaweicloud.com> <20230904133415.1799503-3-roberto.sassu@huaweicloud.com> Content-Type: text/plain; charset="ISO-8859-15" X-Mailer: Evolution 3.28.5 (3.28.5-22.el8) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: k9vtrmvf_jr5Aju86L5AhcagQ05seHkC X-Proofpoint-GUID: f5GLYj_fQbiDab6xRZa3zu3I1Dw5ExMb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-11_13,2023-10-11_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 impostorscore=0 bulkscore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310110168 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org On Wed, 2023-10-11 at 18:02 +0200, Roberto Sassu wrote: > On Wed, 2023-10-11 at 10:38 -0400, Mimi Zohar wrote: > > On Mon, 2023-09-04 at 15:33 +0200, Roberto Sassu wrote: > > > From: Roberto Sassu > > > > > > Change ima_post_path_mknod() definition, so that it can be registered as > > > implementation of the path_post_mknod hook. Since LSMs see a umask-stripped > > > mode from security_path_mknod(), pass the same to ima_post_path_mknod() as > > > well. > > > Also, make sure that ima_post_path_mknod() is executed only if > > > (mode & S_IFMT) is equal to zero or S_IFREG. > > > > > > Add this check to take into account the different placement of the > > > path_post_mknod hook (to be introduced) in do_mknodat(). > > > > Move "(to be introduced)" to when it is first mentioned. > > > > > Since the new hook > > > will be placed after the switch(), the check ensures that > > > ima_post_path_mknod() is invoked as originally intended when it is > > > registered as implementation of path_post_mknod. > > > > > > Signed-off-by: Roberto Sassu > > > --- > > > fs/namei.c | 9 ++++++--- > > > include/linux/ima.h | 7 +++++-- > > > security/integrity/ima/ima_main.c | 10 +++++++++- > > > 3 files changed, 20 insertions(+), 6 deletions(-) > > > > > > diff --git a/fs/namei.c b/fs/namei.c > > > index e56ff39a79bc..c5e96f716f98 100644 > > > --- a/fs/namei.c > > > +++ b/fs/namei.c > > > @@ -4024,6 +4024,7 @@ static int do_mknodat(int dfd, struct filename *name, umode_t mode, > > > struct path path; > > > int error; > > > unsigned int lookup_flags = 0; > > > + umode_t mode_stripped; > > > > > > error = may_mknod(mode); > > > if (error) > > > @@ -4034,8 +4035,9 @@ static int do_mknodat(int dfd, struct filename *name, umode_t mode, > > > if (IS_ERR(dentry)) > > > goto out1; > > > > > > - error = security_path_mknod(&path, dentry, > > > - mode_strip_umask(path.dentry->d_inode, mode), dev); > > > + mode_stripped = mode_strip_umask(path.dentry->d_inode, mode); > > > + > > > + error = security_path_mknod(&path, dentry, mode_stripped, dev); > > > if (error) > > > goto out2; > > > > > > @@ -4045,7 +4047,8 @@ static int do_mknodat(int dfd, struct filename *name, umode_t mode, > > > error = vfs_create(idmap, path.dentry->d_inode, > > > dentry, mode, true); > > > if (!error) > > > - ima_post_path_mknod(idmap, dentry); > > > + ima_post_path_mknod(idmap, &path, dentry, > > > + mode_stripped, dev); > > > break; > > > case S_IFCHR: case S_IFBLK: > > > error = vfs_mknod(idmap, path.dentry->d_inode, > > > diff --git a/include/linux/ima.h b/include/linux/ima.h > > > index 910a2f11a906..179ce52013b2 100644 > > > --- a/include/linux/ima.h > > > +++ b/include/linux/ima.h > > > @@ -32,7 +32,8 @@ extern int ima_read_file(struct file *file, enum kernel_read_file_id id, > > > extern int ima_post_read_file(struct file *file, void *buf, loff_t size, > > > enum kernel_read_file_id id); > > > extern void ima_post_path_mknod(struct mnt_idmap *idmap, > > > - struct dentry *dentry); > > > + const struct path *dir, struct dentry *dentry, > > > + umode_t mode, unsigned int dev); > > > extern int ima_file_hash(struct file *file, char *buf, size_t buf_size); > > > extern int ima_inode_hash(struct inode *inode, char *buf, size_t buf_size); > > > extern void ima_kexec_cmdline(int kernel_fd, const void *buf, int size); > > > @@ -114,7 +115,9 @@ static inline int ima_post_read_file(struct file *file, void *buf, loff_t size, > > > } > > > > > > static inline void ima_post_path_mknod(struct mnt_idmap *idmap, > > > - struct dentry *dentry) > > > + const struct path *dir, > > > + struct dentry *dentry, > > > + umode_t mode, unsigned int dev) > > > { > > > return; > > > } > > > diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c > > > index 365db0e43d7c..76eba92d7f10 100644 > > > --- a/security/integrity/ima/ima_main.c > > > +++ b/security/integrity/ima/ima_main.c > > > @@ -696,18 +696,26 @@ void ima_post_create_tmpfile(struct mnt_idmap *idmap, > > > /** > > > * ima_post_path_mknod - mark as a new inode > > > * @idmap: idmap of the mount the inode was found from > > > + * @dir: path structure of parent of the new file > > > * @dentry: newly created dentry > > > + * @mode: mode of the new file > > > + * @dev: undecoded device number > > > * > > > * Mark files created via the mknodat syscall as new, so that the > > > * file data can be written later. > > > */ > > > void ima_post_path_mknod(struct mnt_idmap *idmap, > > > - struct dentry *dentry) > > > + const struct path *dir, struct dentry *dentry, > > > + umode_t mode, unsigned int dev) > > > { > > > struct integrity_iint_cache *iint; > > > struct inode *inode = dentry->d_inode; > > > int must_appraise; > > > > > > + /* See do_mknodat(), IMA is executed for case 0: and case S_IFREG: */ > > > + if ((mode & S_IFMT) != 0 && (mode & S_IFMT) != S_IFREG) > > > + return; > > > + > > > > There's already a check below to make sure that this is a regular file. > > Are both needed? > > You are right, I can remove the first check. The question then becomes why modify hook the arguments? > > > > if (!ima_policy_flag || !S_ISREG(inode->i_mode)) > > > return; > > > > -- thanks, Mimi