projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'serge-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh...
[cascardo/linux.git]
/
security
/
capability.c
diff --git
a/security/capability.c
b/security/capability.c
index
ad0d4de
..
e76373d
100644
(file)
--- a/
security/capability.c
+++ b/
security/capability.c
@@
-879,7
+879,7
@@
static void cap_key_free(struct key *key)
}
static int cap_key_permission(key_ref_t key_ref, const struct cred *cred,
-
key_perm_t
perm)
+
unsigned
perm)
{
return 0;
}