Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
security
/
apparmor
/
domain.c
diff --git
a/kernel/security/apparmor/domain.c
b/kernel/security/apparmor/domain.c
index
dc0027b
..
53426a6
100644
(file)
--- a/
kernel/security/apparmor/domain.c
+++ b/
kernel/security/apparmor/domain.c
@@
-623,8
+623,8
@@
int aa_change_hat(const char *hats[], int count, u64 token, bool permtest)
/* released below */
cred = get_current_cred();
cxt = cred_cxt(cred);
/* released below */
cred = get_current_cred();
cxt = cred_cxt(cred);
- profile = aa_
cred_profile(cred
);
- previous_profile =
cxt->previous
;
+ profile = aa_
get_newest_profile(aa_cred_profile(cred)
);
+ previous_profile =
aa_get_newest_profile(cxt->previous)
;
if (unconfined(profile)) {
info = "unconfined";
if (unconfined(profile)) {
info = "unconfined";
@@
-720,6
+720,8
@@
audit:
out:
aa_put_profile(hat);
kfree(name);
out:
aa_put_profile(hat);
kfree(name);
+ aa_put_profile(profile);
+ aa_put_profile(previous_profile);
put_cred(cred);
return error;
put_cred(cred);
return error;