diff mbox series

[v3,05/10] certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID

Message ID 20210114151909.2344974-6-mic@digikod.net
State Superseded
Headers show
Series Enable root to update the blacklist keyring | expand

Commit Message

Mickaël Salaün Jan. 14, 2021, 3:19 p.m. UTC 
From: Mickaël Salaün <mic@linux.microsoft.com>

Align with the new macros and add appropriate include files.

Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Mickaël Salaün <mic@linux.microsoft.com>
Signed-off-by: David Howells <dhowells@redhat.com>
---

Changes since v2:
* Cherry-pick v1 patch from
  https://lore.kernel.org/lkml/2659836.1607940186@warthog.procyon.org.uk/
  to rebase on v5.11-rc3.
---
 certs/blacklist.c      | 4 ++--
 certs/system_keyring.c | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

Comments

Jarkko Sakkinen Jan. 20, 2021, 5:15 a.m. UTC | #1 
On Thu, Jan 14, 2021 at 04:19:04PM +0100, Mickaël Salaün wrote:
> From: Mickaël Salaün <mic@linux.microsoft.com>

> 

> Align with the new macros and add appropriate include files.

> 

> Cc: David Woodhouse <dwmw2@infradead.org>

> Signed-off-by: Mickaël Salaün <mic@linux.microsoft.com>

> Signed-off-by: David Howells <dhowells@redhat.com>


The commit message makes no sense. What you new macros?

/Jarkko
Mickaël Salaün Jan. 20, 2021, 11:17 a.m. UTC | #2 
On 20/01/2021 06:15, Jarkko Sakkinen wrote:
> On Thu, Jan 14, 2021 at 04:19:04PM +0100, Mickaël Salaün wrote:

>> From: Mickaël Salaün <mic@linux.microsoft.com>

>>

>> Align with the new macros and add appropriate include files.

>>

>> Cc: David Woodhouse <dwmw2@infradead.org>

>> Signed-off-by: Mickaël Salaün <mic@linux.microsoft.com>

>> Signed-off-by: David Howells <dhowells@redhat.com>

> 

> The commit message makes no sense. What you new macros?


What about "Use the new GLOBAL_ROOT_UID and GLOBAL_ROOT_GID definitions,
and add appropriate include files."?

> 

> /Jarkko

>
Jarkko Sakkinen Jan. 20, 2021, 11:48 p.m. UTC | #3 
On Wed, Jan 20, 2021 at 12:17:28PM +0100, Mickaël Salaün wrote:
> 

> On 20/01/2021 06:15, Jarkko Sakkinen wrote:

> > On Thu, Jan 14, 2021 at 04:19:04PM +0100, Mickaël Salaün wrote:

> >> From: Mickaël Salaün <mic@linux.microsoft.com>

> >>

> >> Align with the new macros and add appropriate include files.

> >>

> >> Cc: David Woodhouse <dwmw2@infradead.org>

> >> Signed-off-by: Mickaël Salaün <mic@linux.microsoft.com>

> >> Signed-off-by: David Howells <dhowells@redhat.com>

> > 

> > The commit message makes no sense. What you new macros?

> 

> What about "Use the new GLOBAL_ROOT_UID and GLOBAL_ROOT_GID definitions,

> and add appropriate include files."?


They were added in 2011 so you could just remove "the new". Otherwise,
WFM.

/Jarkko
diff mbox series

Patch

diff --git a/certs/blacklist.c b/certs/blacklist.c
index 029471947838..bffe4c6f4a9e 100644
--- a/certs/blacklist.c
+++ b/certs/blacklist.c
@@ -14,6 +14,7 @@ 
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/seq_file.h>
+#include <linux/uidgid.h>
 #include <keys/system_keyring.h>
 #include "blacklist.h"
 
@@ -156,8 +157,7 @@  static int __init blacklist_init(void)
 
 	blacklist_keyring =
 		keyring_alloc(".blacklist",
-			      KUIDT_INIT(0), KGIDT_INIT(0),
-			      current_cred(),
+			      GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, current_cred(),
 			      (KEY_POS_ALL & ~KEY_POS_SETATTR) |
 			      KEY_USR_VIEW | KEY_USR_READ |
 			      KEY_USR_SEARCH,
diff --git a/certs/system_keyring.c b/certs/system_keyring.c
index 798291177186..4b693da488f1 100644
--- a/certs/system_keyring.c
+++ b/certs/system_keyring.c
@@ -11,6 +11,7 @@ 
 #include <linux/cred.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/uidgid.h>
 #include <linux/verification.h>
 #include <keys/asymmetric-type.h>
 #include <keys/system_keyring.h>
@@ -98,7 +99,7 @@  static __init int system_trusted_keyring_init(void)
 
 	builtin_trusted_keys =
 		keyring_alloc(".builtin_trusted_keys",
-			      KUIDT_INIT(0), KGIDT_INIT(0), current_cred(),
+			      GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, current_cred(),
 			      ((KEY_POS_ALL & ~KEY_POS_SETATTR) |
 			      KEY_USR_VIEW | KEY_USR_READ | KEY_USR_SEARCH),
 			      KEY_ALLOC_NOT_IN_QUOTA,
@@ -109,7 +110,7 @@  static __init int system_trusted_keyring_init(void)
 #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING
 	secondary_trusted_keys =
 		keyring_alloc(".secondary_trusted_keys",
-			      KUIDT_INIT(0), KGIDT_INIT(0), current_cred(),
+			      GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, current_cred(),
 			      ((KEY_POS_ALL & ~KEY_POS_SETATTR) |
 			       KEY_USR_VIEW | KEY_USR_READ | KEY_USR_SEARCH |
 			       KEY_USR_WRITE),