2021-02-02 21:30:09

by Juergen Borleis

[permalink] [raw]
Subject: [PATCH] fs: ubifs: set s_uuid in super block to support ima/evm uuid options

From: Steffen Trumtrar <[email protected]>

This is required to provide uuid based integrity functionality for:
ima_policy (fsuuid option) and the 'evmctl' command ('--uuid' option).

Signed-off-by: Steffen Trumtrar <[email protected]>
Signed-off-by: Oleksij Rempel <[email protected]>
Acked-by: Juergen Borleis <[email protected]>
---
fs/ubifs/super.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index cb3acfb7dd1f..b990baed4de0 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2231,6 +2231,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
err = -ENOMEM;
goto out_umount;
}
+ memcpy(&sb->s_uuid, &c->uuid, sizeof(c->uuid));

mutex_unlock(&c->umount_mutex);
return 0;
--
2.20.1


2021-02-12 21:04:37

by Richard Weinberger

[permalink] [raw]
Subject: Re: [PATCH] fs: ubifs: set s_uuid in super block to support ima/evm uuid options

On Tue, Feb 2, 2021 at 1:55 PM Juergen Borleis <[email protected]> wrote:
>
> From: Steffen Trumtrar <[email protected]>
>
> This is required to provide uuid based integrity functionality for:
> ima_policy (fsuuid option) and the 'evmctl' command ('--uuid' option).
>
> Signed-off-by: Steffen Trumtrar <[email protected]>
> Signed-off-by: Oleksij Rempel <[email protected]>
> Acked-by: Juergen Borleis <[email protected]>

I took this patch, thanks a lot for this but I have changed the sob-chain to:

Co-developed-by: Oleksij Rempel <[email protected]>
Co-developed-by: Juergen Borleis <[email protected]>
Signed-off-by: Steffen Trumtrar <[email protected]>

Namely, "patch was created by Steffen Trumtrar, Oleksij Rempel and
Juergen Borleis.
Steffen Trumtrar committed it and Juergen Borleis later sent it to the
mailing list".

Is this right?

--
Thanks,
//richard

2021-02-12 21:37:59

by Richard Weinberger

[permalink] [raw]
Subject: Re: [PATCH] fs: ubifs: set s_uuid in super block to support ima/evm uuid options

Andy,

----- Ursprüngliche Mail -----
>> + memcpy(&sb->s_uuid, &c->uuid, sizeof(c->
> Shouldn’t it be `import_uuid()`?

Hmm, I didn't know that helper.
The only user in fs/ seems to be zonefs, all other filesystems do a plain memcpy().

Do you want me do a patch that converts all users in fs/ to import_uuid()?

Thanks,
//richard

2021-02-13 22:04:03

by Richard Weinberger

[permalink] [raw]
Subject: Re: [PATCH] fs: ubifs: set s_uuid in super block to support ima/evm uuid options

----- Ursprüngliche Mail -----
>> Hmm, I didn't know that helper.
>> The only user in fs/ seems to be zonefs, all other filesystems do a plain
>> memcpy().

>> Do you want me do a patch that converts all users in fs/ to import_uuid()?
> Not sure about all fs, but in new code, like here I think it makes sense. Also
> check export_uuid() and uuid_copy().

Okay. I've dropped the patch from linux-next.
Juergen, please address Andy's comments and resend.

Thanks,
//richard

2021-02-15 08:41:19

by Juergen Borleis

[permalink] [raw]
Subject: Re: [PATCH] fs: ubifs: set s_uuid in super block to support ima/evm uuid options

Hi Richard,

Am Freitag, 12. Februar 2021, 21:59:52 CET schrieb Richard Weinberger:
> On Tue, Feb 2, 2021 at 1:55 PM Juergen Borleis <[email protected]> wrote:
> > From: Steffen Trumtrar <[email protected]>
> >
> > This is required to provide uuid based integrity functionality for:
> > ima_policy (fsuuid option) and the 'evmctl' command ('--uuid' option).
> >
> > Signed-off-by: Steffen Trumtrar <[email protected]>
> > Signed-off-by: Oleksij Rempel <[email protected]>
> > Acked-by: Juergen Borleis <[email protected]>
>
> I took this patch, thanks a lot for this but I have changed the sob-chain
> to:
>
> Co-developed-by: Oleksij Rempel <[email protected]>
> Co-developed-by: Juergen Borleis <[email protected]>
> Signed-off-by: Steffen Trumtrar <[email protected]>
>
> Namely, "patch was created by Steffen Trumtrar, Oleksij Rempel and
> Juergen Borleis.
> Steffen Trumtrar committed it and Juergen Borleis later sent it to the
> mailing list".
>
> Is this right?

Yes.

> Okay. I've dropped the patch from linux-next.
> Juergen, please address Andy's comments and resend.

I will talk to Steffen and re-send a V2.

Thanks,
Jürgen