From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mimi Zohar <zohar@linux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
Christian Brauner <christian@brauner.io>,
Seth Forshee <sforshee@kernel.org>
Cc: Roberto Sassu <roberto.sassu@huawei.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the integrity tree
Date: Tue, 7 Feb 2023 11:51:13 +1100 [thread overview]
Message-ID: <20230207115113.21efd917@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2626 bytes --]
Hi all,
After merging the integrity tree, today's linux-next build (x86_64
allmodconfig) failed like this:
security/integrity/ima/ima_main.c: In function 'ima_file_mprotect':
security/integrity/ima/ima_main.c:473:34: error: implicit declaration of function 'file_mnt_user_ns'; did you mean 'get_user_ns'? [-Werror=implicit-function-declaration]
473 | action |= ima_get_action(file_mnt_user_ns(vma->vm_file), inode,
| ^~~~~~~~~~~~~~~~
| get_user_ns
security/integrity/ima/ima_main.c:473:34: error: passing argument 1 of 'ima_get_action' makes pointer from integer without a cast [-Werror=int-conversion]
473 | action |= ima_get_action(file_mnt_user_ns(vma->vm_file), inode,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| int
In file included from security/integrity/ima/ima_main.c:30:
security/integrity/ima/ima.h:258:38: note: expected 'struct mnt_idmap *' but argument is of type 'int'
258 | int ima_get_action(struct mnt_idmap *idmap, struct inode *inode,
| ~~~~~~~~~~~~~~~~~~^~~~~
cc1: all warnings being treated as errors
Caused by commit
4958db3245fa ("ima: Introduce MMAP_CHECK_REQPROT hook")
interacting with commit
39f60c1ccee7 ("fs: port xattr to mnt_idmap")
from the vfs-idmapping tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 7 Feb 2023 11:31:16 +1100
Subject: [PATCH] fixup for "ima: Introduce MMAP_CHECK_REQPROT hook"
interacting with "fs: port xattr to mnt_idmap"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
security/integrity/ima/ima_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 7a05af9f481f..d66a0a36415e 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -470,7 +470,7 @@ int ima_file_mprotect(struct vm_area_struct *vma, unsigned long prot)
action = ima_get_action(file_mnt_idmap(vma->vm_file), inode,
current_cred(), secid, MAY_EXEC, MMAP_CHECK,
&pcr, &template, NULL, NULL);
- action |= ima_get_action(file_mnt_user_ns(vma->vm_file), inode,
+ action |= ima_get_action(file_mnt_idmap(vma->vm_file), inode,
current_cred(), secid, MAY_EXEC,
MMAP_CHECK_REQPROT, &pcr, &template, NULL,
NULL);
--
2.35.1
x
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-02-07 0:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-07 0:51 Stephen Rothwell [this message]
2023-02-07 12:48 ` linux-next: build failure after merge of the integrity tree Roberto Sassu
-- strict thread matches above, loose matches on Subject: below --
2019-08-06 2:15 Stephen Rothwell
2019-08-06 3:18 ` Thiago Jung Bauermann
2019-08-06 3:45 ` Stephen Rothwell
2019-08-06 19:02 ` Mimi Zohar
2019-06-14 5:34 Stephen Rothwell
2019-06-14 14:09 ` Mimi Zohar
2018-07-17 4:40 Stephen Rothwell
2018-07-17 13:18 ` Mimi Zohar
2018-07-17 22:21 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230207115113.21efd917@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christian@brauner.io \
--cc=dmitry.kasatkin@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=roberto.sassu@huawei.com \
--cc=sforshee@kernel.org \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).