lkml.org 
[lkml]   [2021]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subjectlinux-next: build failure after merge of the selinux tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-10-05 05:11    [W:0.051 / U:0.040 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site