From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Howells <dhowells@redhat.com>
Cc: 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 keys tree
Date: Fri, 11 Dec 2020 15:50:31 +1100 [thread overview]
Message-ID: <20201211155031.0e35abf2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3073 bytes --]
Hi all,
After merging the keys tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from include/linux/cred.h:13,
from security/integrity/ima/ima_mok.c:12:
security/integrity/ima/ima_mok.c: In function 'ima_mok_init':
include/linux/key.h:292:29: warning: passing argument 7 of 'keyring_alloc' makes pointer from integer without a cast [-Wint-conversion]
292 | #define KEY_ALLOC_SET_KEEP 0x0020 /* Set the KEEP flag on the key/keyring */
| ^~~~~~
| |
| int
security/integrity/ima/ima_mok.c:42:5: note: in expansion of macro 'KEY_ALLOC_SET_KEEP'
42 | KEY_ALLOC_SET_KEEP,
| ^~~~~~~~~~~~~~~~~~
include/linux/key.h:410:30: note: expected 'struct key_restriction *' but argument is of type 'int'
410 | struct key_restriction *restrict_link,
| ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~
security/integrity/ima/ima_mok.c:43:5: error: passing argument 8 of 'keyring_alloc' from incompatible pointer type [-Werror=incompatible-pointer-types]
43 | restriction, NULL);
| ^~~~~~~~~~~
| |
| struct key_restriction *
In file included from include/linux/cred.h:13,
from security/integrity/ima/ima_mok.c:12:
include/linux/key.h:411:18: note: expected 'struct key *' but argument is of type 'struct key_restriction *'
411 | struct key *dest);
| ~~~~~~~~~~~~^~~~
security/integrity/ima/ima_mok.c:36:26: error: too many arguments to function 'keyring_alloc'
36 | ima_blacklist_keyring = keyring_alloc(".ima_blacklist",
| ^~~~~~~~~~~~~
In file included from include/linux/cred.h:13,
from security/integrity/ima/ima_mok.c:12:
include/linux/key.h:406:20: note: declared here
406 | extern struct key *keyring_alloc(const char *description, kuid_t uid, kgid_t gid,
| ^~~~~~~~~~~~~
Caused by commit
33c36b2053de ("certs: Fix blacklist flag type confusion")
I have applied the following fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 11 Dec 2020 15:46:09 +1100
Subject: [PATCH] fixup for "certs: Fix blacklist flag type confusion"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
security/integrity/ima/ima_mok.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/security/integrity/ima/ima_mok.c b/security/integrity/ima/ima_mok.c
index ce8871d96f12..5594dd38ab04 100644
--- a/security/integrity/ima/ima_mok.c
+++ b/security/integrity/ima/ima_mok.c
@@ -38,8 +38,7 @@ __init int ima_mok_init(void)
(KEY_POS_ALL & ~KEY_POS_SETATTR) |
KEY_USR_VIEW | KEY_USR_READ |
KEY_USR_WRITE | KEY_USR_SEARCH,
- KEY_ALLOC_NOT_IN_QUOTA,
- KEY_ALLOC_SET_KEEP,
+ KEY_ALLOC_NOT_IN_QUOTA | KEY_ALLOC_SET_KEEP,
restriction, NULL);
if (IS_ERR(ima_blacklist_keyring))
--
2.29.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-12-11 4:59 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-11 4:50 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-18 4:57 linux-next: build failure after merge of the keys tree Stephen Rothwell
2020-05-14 4:30 Stephen Rothwell
2020-05-14 4:46 ` Jason A. Donenfeld
2020-05-14 12:11 ` David Howells
2020-05-14 12:34 ` Masahiro Yamada
2020-05-14 23:25 ` Jason A. Donenfeld
2020-03-02 0:37 Stephen Rothwell
2020-03-02 15:23 ` Pavel Begunkov
2020-05-04 3:25 ` Stephen Rothwell
2020-05-04 3:29 ` Stephen Rothwell
2020-02-09 23:05 Stephen Rothwell
2020-02-09 23:07 ` Stephen Rothwell
2020-02-11 23:23 ` Stephen Rothwell
2020-01-16 1:36 Stephen Rothwell
2019-08-29 5:31 Stephen Rothwell
2019-09-02 6:19 ` Stephen Rothwell
2019-09-02 16:01 ` David Howells
2019-09-02 23:07 ` Stephen Rothwell
2019-09-02 23:21 ` Stephen Rothwell
2019-09-02 23:53 ` David Howells
2019-09-03 0:29 ` Stephen Rothwell
2019-09-02 23:20 ` David Howells
2019-09-02 23:39 ` Stephen Rothwell
2019-09-02 23:51 ` David Howells
2019-08-16 5:04 Stephen Rothwell
2017-11-13 2:08 Stephen Rothwell
2017-11-13 11:21 ` David Howells
2017-04-04 3:39 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=20201211155031.0e35abf2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).