projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID
[linux-2.6-microblaze.git]
/
certs
/
system_keyring.c
diff --git
a/certs/system_keyring.c
b/certs/system_keyring.c
index
7982911
..
4b693da
100644
(file)
--- 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/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>
#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",
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,
((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",
#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),
((KEY_POS_ALL & ~KEY_POS_SETATTR) |
KEY_USR_VIEW | KEY_USR_READ | KEY_USR_SEARCH |
KEY_USR_WRITE),