Commit a6cb0ab7 authored by Mickaël Salaün's avatar Mickaël Salaün Committed by David Howells
Browse files

certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID 



Align with the new macros and add appropriate include files.

Signed-off-by: default avatarMickaël Salaün <mic@linux.microsoft.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Cc: David Woodhouse <dwmw2@infradead.org>
parent 4993e1f9

certs/blacklist.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

certs/system_keyring.c

+3 −2
Original line number Diff line number Diff line
@@ -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),