From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Moore <paul@paul-moore.com>, Jens Axboe <axboe@kernel.dk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Pavel Begunkov <asml.silence@gmail.com>
Subject: linux-next: build failure after merge of the selinux tree
Date: Tue, 5 Oct 2021 14:10:12 +1100 [thread overview]
Message-ID: <20211005141012.31e20a26@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1433 bytes --]
Hi all,
After merging the selinux tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/io_uring.c: In function 'io_init_req':
fs/io_uring.c:7069:3: error: 'ret' undeclared (first use in this function); did you mean 'req'?
7069 | ret = security_uring_override_creds(req->creds);
| ^~~
| req
fs/io_uring.c:7069:3: note: each undeclared identifier is reported only once for each function it appears in
Caused by commit
cdc1404a4046 ("lsm,io_uring: add LSM hooks to io_uring")
interacting with commit
1e1e4658e108 ("io_uring: init opcode in io_init_req()")
from the block tree.
I have applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 5 Oct 2021 14:01:10 +1100
Subject: [PATCH] fixup for "io_uring: init opcode in io_init_req()"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/io_uring.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 9a3c3198ff90..c36ae439e64f 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7062,6 +7062,8 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,
personality = READ_ONCE(sqe->personality);
if (personality) {
+ int ret;
+
req->creds = xa_load(&ctx->personalities, personality);
if (!req->creds)
return -EINVAL;
--
2.33.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-10-05 3:10 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-05 3:10 Stephen Rothwell [this message]
2021-10-05 13:57 ` linux-next: build failure after merge of the selinux tree Paul Moore
-- strict thread matches above, loose matches on Subject: below --
2024-03-27 2:10 Stephen Rothwell
2024-03-27 13:13 ` Paul Moore
2019-12-10 1:40 Stephen Rothwell
2019-12-10 2:25 ` Paul Moore
2019-04-03 1:22 Stephen Rothwell
2019-04-03 1:25 ` Paul Moore
2019-03-19 1:40 Stephen Rothwell
2019-03-19 17:11 ` Paul Moore
2017-05-22 2:48 Stephen Rothwell
2017-05-22 21:12 ` Paul Moore
2017-05-22 21:16 ` Daniel Jurgens
2017-01-10 1:27 Stephen Rothwell
2017-01-11 3:11 ` Paul Moore
2017-02-10 2:50 ` Stephen Rothwell
2017-02-10 12:34 ` Paul Moore
2012-01-05 4:24 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=20211005141012.31e20a26@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul@paul-moore.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).