Skip to contentSkip to conversation

selinux: fix double free

PATCH Superseded [email protected] 2 participants 4 messages Jun 10, 2020 SELinux security module

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover selinux: fix double free

From: Tom Rix <[email protected]>

Repo: linux-next
Tag: next-20200609

Running clang scan-view over linux-next uncovers many problem only a few are memory related, this one looked like the most serious.

Tom Rix (1):
selinux: fix double free

 security/selinux/ss/services.c | 4 ++++
 1 file changed, 4 insertions(+)
Signature · 1 line
2.18.1
#1 lore raw

PATCH 1/1 selinux: fix double free

From: Tom Rix <[email protected]>

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

---
 security/selinux/ss/services.c | 4 ++++
 1 file changed, 4 insertions(+)
security/selinux/ss/services.c +4 -0
index 313919bd42f8..2dffae1feaff 100644
@@ -2888,8 +2888,12 @@ int security_get_bools(struct selinux_state *state,
 	if (*names) {
 		for (i = 0; i < *len; i++)
 			kfree((*names)[i]);
+		kfree(names);
 	}
 	kfree(*values);
+	*len = 0;
+	*names = NULL;
+	*values = NULL;
 	goto out;
 }
 
Signature · 1 line
2.18.1
maintainer
#2 lore raw
Quoted 25 lines · On Wed, Jun 10, 2020 at 2:10 PM <[email protected]> wrote:

From: Tom Rix <[email protected]>

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

---
 security/selinux/ss/services.c | 4 ++++
 1 file changed, 4 insertions(+)
security/selinux/ss/services.c +0 -0
index 313919bd42f8..2dffae1feaff 100644

security/selinux/ss/services.c int security_get_bools(struct selinux_state *state, · line 2891

Quoted 4 lines
security/selinux/ss/services.c +1 -0
@@ -2888,8 +2888,12 @@ int security_get_bools(struct selinux_state *state,
        if (*names) {
                for (i = 0; i < *len; i++)
                        kfree((*names)[i]);
+               kfree(names);

kfree(*names)?

security/selinux/ss/services.c int security_get_bools(struct selinux_state *state, · line 2898

Quoted 7 lines
security/selinux/ss/services.c +3 -0
        }
        kfree(*values);
+       *len = 0;
+       *names = NULL;
+       *values = NULL;
        goto out;
 }

Wondering if the caller handling ought to be changed too even though this should avoid the problem.

author
#3 lore raw
Quoted 9 lines

security/selinux/ss/services.c int security_get_bools(struct selinux_state *state, · line 2891

Quoted 8 lines

+++ b/security/selinux/ss/services.c

security/selinux/ss/services.c +1 -0
@@ -2888,8 +2888,12 @@ int security_get_bools(struct selinux_state *state,
        if (*names) {
                for (i = 0; i < *len; i++)
                        kfree((*names)[i]);
+               kfree(names);

kfree(*names)?

Yes.

Quoted 9 lines

kfree(*values);

security/selinux/ss/services.c int security_get_bools(struct selinux_state *state, · line 2898

Quoted 5 lines
security/selinux/ss/services.c +3 -0
+       *len = 0;
+       *names = NULL;
+       *values = NULL;
        goto out;
 }

Wondering if the caller handling ought to be changed too even though this should avoid the problem.

The poisoning of the returns avoids this.