Re: linux-next: build failure after merge of the selinux tree

[Paul Moore]

On Mon, Oct 4, 2021 at 11:10 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 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.

Thanks Stephen, your fix looks sane to me.

> I have applied the following merge fix patch:
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxx>
> ---
>  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;

-- 
paul moore
www.paul-moore.com