projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dhowells' (patches from DavidH)
[platform/kernel/linux-rpi.git]
/
kernel
/
cred.c
diff --git
a/kernel/cred.c
b/kernel/cred.c
index
56395be
..
809a985
100644
(file)
--- a/
kernel/cred.c
+++ b/
kernel/cred.c
@@
-223,7
+223,7
@@
struct cred *cred_alloc_blank(void)
new->magic = CRED_MAGIC;
#endif
new->magic = CRED_MAGIC;
#endif
- if (security_cred_alloc_blank(new, GFP_KERNEL) < 0)
+ if (security_cred_alloc_blank(new, GFP_KERNEL
_ACCOUNT
) < 0)
goto error;
return new;
goto error;
return new;
@@
-282,7
+282,7
@@
struct cred *prepare_creds(void)
new->security = NULL;
#endif
new->security = NULL;
#endif
- if (security_prepare_creds(new, old, GFP_KERNEL) < 0)
+ if (security_prepare_creds(new, old, GFP_KERNEL
_ACCOUNT
) < 0)
goto error;
validate_creds(new);
return new;
goto error;
validate_creds(new);
return new;
@@
-715,7
+715,7
@@
struct cred *prepare_kernel_cred(struct task_struct *daemon)
#ifdef CONFIG_SECURITY
new->security = NULL;
#endif
#ifdef CONFIG_SECURITY
new->security = NULL;
#endif
- if (security_prepare_creds(new, old, GFP_KERNEL) < 0)
+ if (security_prepare_creds(new, old, GFP_KERNEL
_ACCOUNT
) < 0)
goto error;
put_cred(old);
goto error;
put_cred(old);