Skip to contentSkip to conversation

selinux: fix context string corruption in convert_context()

PATCH In review Ondrej Mosnacek 3 participants 3 messages Oct 3, 2019 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selinux: fix context string corruption in convert_context()

string_to_context_struct() may garble the context string, so we need to copy back the contents again from the old context struct to avoid storing the corrupted context.

Since string_to_context_struct() tokenizes (and therefore truncates) the context string and we are later potentially copying it with kstrdup(), this may eventually cause pieces of uninitialized kernel memory to be disclosed to userspace (when copying to userspace based on the stored length and not the null character).

How to reproduce on Fedora and similar:

    # dnf install -y memcached
    # systemctl start memcached
    # semodule -d memcached
    # load_policy
    # load_policy
    # systemctl stop memcached
    # ausearch -m AVC
    type=AVC msg=audit(1570090572.648:313): avc:  denied  { signal } for  pid=1 comm="systemd" scontext=system_u:system_r:init_t:s0 tcontext=system_u:object_r:unlabeled_t:s0 tclass=process permissive=0 trawcon=73797374656D5F75007400000000000070BE6E847296FFFF726F6D000096FFFF76
Fixes ee1a84fdfeed ("selinux: overhaul sidtab to fix bug and improve performance")
---
 security/selinux/ss/services.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
security/selinux/ss/services.c +8 -1
index 3a29e7c24ba9..a5813c7629c1 100644
@@ -1946,7 +1946,14 @@ static int convert_context(struct context *oldc, struct context *newc, void *p)
 		rc = string_to_context_struct(args->newp, NULL, s,
 					      newc, SECSID_NULL);
 		if (rc == -EINVAL) {
-			/* Retain string representation for later mapping. */
+			/*
+			 * Retain string representation for later mapping.
+			 *
+			 * IMPORTANT: We need to copy the contents of oldc->str
+			 * back into s again because string_to_context_struct()
+			 * may have garbled it.
+			 */
+			memcpy(s, oldc->str, oldc->len);
 			context_init(newc);
 			newc->str = s;
 			newc->len = oldc->len;
Signature · 1 line
2.21.0
Acked-by on v1 1/1
#1 lore raw
Quoted 20 lines · Ondrej Mosnacek

string_to_context_struct() may garble the context string, so we need to copy back the contents again from the old context struct to avoid storing the corrupted context.

Since string_to_context_struct() tokenizes (and therefore truncates) the context string and we are later potentially copying it with kstrdup(), this may eventually cause pieces of uninitialized kernel memory to be disclosed to userspace (when copying to userspace based on the stored length and not the null character).

How to reproduce on Fedora and similar:

     # dnf install -y memcached
     # systemctl start memcached
     # semodule -d memcached
     # load_policy
     # load_policy
     # systemctl stop memcached
     # ausearch -m AVC
     type=AVC msg=audit(1570090572.648:313): avc:  denied  { signal } for  pid=1 comm="systemd" scontext=system_u:system_r:init_t:s0 tcontext=system_u:object_r:unlabeled_t:s0 tclass=process permissive=0 trawcon=73797374656D5F75007400000000000070BE6E847296FFFF726F6D000096FFFF76
Quoted 3 lines
Fixes ee1a84fdfeed ("selinux: overhaul sidtab to fix bug and improve performance")
Quoted 25 lines
---
  security/selinux/ss/services.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
security/selinux/ss/services.c +8 -1
index 3a29e7c24ba9..a5813c7629c1 100644
@@ -1946,7 +1946,14 @@ static int convert_context(struct context *oldc, struct context *newc, void *p)
  		rc = string_to_context_struct(args->newp, NULL, s,
  					      newc, SECSID_NULL);
  		if (rc == -EINVAL) {
-			/* Retain string representation for later mapping. */
+			/*
+			 * Retain string representation for later mapping.
+			 *
+			 * IMPORTANT: We need to copy the contents of oldc->str
+			 * back into s again because string_to_context_struct()
+			 * may have garbled it.
+			 */
+			memcpy(s, oldc->str, oldc->len);
  			context_init(newc);
  			newc->str = s;
  			newc->len = oldc->len;
maintainer
#2 lore raw
In reply to Ondrej Mosnacek
Quoted 21 lines · Ondrej Mosnacek

string_to_context_struct() may garble the context string, so we need to copy back the contents again from the old context struct to avoid storing the corrupted context.

Since string_to_context_struct() tokenizes (and therefore truncates) the context string and we are later potentially copying it with kstrdup(), this may eventually cause pieces of uninitialized kernel memory to be disclosed to userspace (when copying to userspace based on the stored length and not the null character).

How to reproduce on Fedora and similar:

    # dnf install -y memcached
    # systemctl start memcached
    # semodule -d memcached
    # load_policy
    # load_policy
    # systemctl stop memcached
    # ausearch -m AVC
    type=AVC msg=audit(1570090572.648:313): avc:  denied  { signal } for  pid=1 comm="systemd" scontext=system_u:system_r:init_t:s0 tcontext=system_u:object_r:unlabeled_t:s0 tclass=process permissive=0 trawcon=73797374656D5F75007400000000000070BE6E847296FFFF726F6D000096FFFF76
Quoted 6 lines
Fixes ee1a84fdfeed ("selinux: overhaul sidtab to fix bug and improve performance")
---
 security/selinux/ss/services.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Thanks for finding and fixing this. This looks like a good candidate for stable so I went ahead and merged it into selinux/stable-5.4; if any one has any objections to that, let me know by the end of the week.

Signature · 2 lines
paul moore
www.paul-moore.com