diff mbox series

fs: ubifs: set s_uuid in super block to support ima/evm uuid options

Message ID 20210202124838.30805-1-jbe@pengutronix.de
State Accepted
Headers show
Series fs: ubifs: set s_uuid in super block to support ima/evm uuid options | expand

Commit Message

Juergen Borleis Feb. 2, 2021, 12:48 p.m. UTC 
From: Steffen Trumtrar <s.trumtrar@pengutronix.de>

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 <s.trumtrar@pengutronix.de>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Acked-by: Juergen Borleis <jbe@pengutronix.de>
---
 fs/ubifs/super.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Richard Weinberger Feb. 12, 2021, 8:59 p.m. UTC | #1 
On Tue, Feb 2, 2021 at 1:55 PM Juergen Borleis <jbe@pengutronix.de> wrote:
>
> From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
>
> 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 <s.trumtrar@pengutronix.de>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> Acked-by: Juergen Borleis <jbe@pengutronix.de>

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

    Co-developed-by: Oleksij Rempel <o.rempel@pengutronix.de>
    Co-developed-by: Juergen Borleis <jbe@pengutronix.de>
    Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>

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?
Richard Weinberger Feb. 12, 2021, 9:34 p.m. UTC | #2 
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
Richard Weinberger Feb. 13, 2021, 10:01 p.m. UTC | #3 
----- 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
Juergen Borleis Feb. 15, 2021, 8:37 a.m. UTC | #4 
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 <jbe@pengutronix.de> wrote:
> > From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > 
> > 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 <s.trumtrar@pengutronix.de>
> > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> > Acked-by: Juergen Borleis <jbe@pengutronix.de>
> 
> I took this patch, thanks a lot for this but I have changed the sob-chain
> to:
> 
>     Co-developed-by: Oleksij Rempel <o.rempel@pengutronix.de>
>     Co-developed-by: Juergen Borleis <jbe@pengutronix.de>
>     Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> 
> 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
diff mbox series

Patch

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;