summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rix <trix@redhat.com>2020-06-10 14:57:13 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-25 15:33:07 +0200
commitcd80735a43a9c8fd5e883f8313e3ba7b27167310 (patch)
treef34659cdfd40de01fb243f11cdd06b550b6d2691
parent9a20612e47796d0e74fa3a4397f8ba334b272ce6 (diff)
downloadlinux-stable-cd80735a43a9c8fd5e883f8313e3ba7b27167310.tar.gz
linux-stable-cd80735a43a9c8fd5e883f8313e3ba7b27167310.tar.bz2
linux-stable-cd80735a43a9c8fd5e883f8313e3ba7b27167310.zip
selinux: fix double free
commit 65de50969a77509452ae590e9449b70a22b923bb upstream. Clang's static analysis tool reports these double free memory errors. security/selinux/ss/services.c:2987:4: warning: Attempt to free released memory [unix.Malloc] kfree(bnames[i]); ^~~~~~~~~~~~~~~~ security/selinux/ss/services.c:2990:2: warning: Attempt to free released memory [unix.Malloc] kfree(bvalues); ^~~~~~~~~~~~~~ So improve the security_get_bools error handling by freeing these variables and setting their return pointers to NULL and the return len to 0 Cc: stable@vger.kernel.org Signed-off-by: Tom Rix <trix@redhat.com> Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com> Signed-off-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--security/selinux/ss/services.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index f3def298a90e..a9f2bc8443bd 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -2857,8 +2857,12 @@ err:
if (*names) {
for (i = 0; i < *len; i++)
kfree((*names)[i]);
+ kfree(*names);
}
kfree(*values);
+ *len = 0;
+ *names = NULL;
+ *values = NULL;
goto out;
}