aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cred.c2
-rw-r--r--kernel/perf_event.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/kernel/cred.c b/kernel/cred.c
index 1ed8ca18790c..099f5e6fb94c 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -786,8 +786,6 @@ bool creds_are_invalid(const struct cred *cred)
786{ 786{
787 if (cred->magic != CRED_MAGIC) 787 if (cred->magic != CRED_MAGIC)
788 return true; 788 return true;
789 if (atomic_read(&cred->usage) < atomic_read(&cred->subscribers))
790 return true;
791#ifdef CONFIG_SECURITY_SELINUX 789#ifdef CONFIG_SECURITY_SELINUX
792 if (selinux_is_enabled()) { 790 if (selinux_is_enabled()) {
793 if ((unsigned long) cred->security < PAGE_SIZE) 791 if ((unsigned long) cred->security < PAGE_SIZE)
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 8891ebf3cc69..43c1dfb7b386 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4848,7 +4848,7 @@ err_fput_free_put_context:
4848 4848
4849err_free_put_context: 4849err_free_put_context:
4850 if (err < 0) 4850 if (err < 0)
4851 kfree(event); 4851 free_event(event);
4852 4852
4853err_put_context: 4853err_put_context:
4854 if (err < 0) 4854 if (err < 0)