.gitignore

@@ -1 +1 @@
-SOURCES/mcstrans-3.5.tar.gz
+SOURCES/mcstrans-2.9.tar.gz

.mcstrans.metadata

@@ -1 +1 @@
-a8b1d4758ab1b1a80a4eb1ffe06cd7cbd1336527 SOURCES/mcstrans-3.5.tar.gz
+64bea2c1cd56e0550049a548dde0ac2e53f71714 SOURCES/mcstrans-2.9.tar.gz

SOURCES/0001-mcstrans-Fir-RESOURCE_LEAK-and-USE_AFTER_FREE-coveri.patch

@@ -0,0 +1,126 @@
+From eeac35fa98b8b2d323741703a2e59593d1ad200a Mon Sep 17 00:00:00 2001
+From: Petr Lautrbach <plautrba@redhat.com>
+Date: Wed, 28 Nov 2018 18:28:05 +0100
+Subject: [PATCH] mcstrans: Fir RESOURCE_LEAK and USE_AFTER_FREE coverity scan
+ defects
+
+---
+ mcstrans/src/mcstrans.c  | 17 ++++++++++++++++-
+ mcstrans/src/mcstransd.c |  4 +++-
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/mcstrans/src/mcstrans.c b/mcstrans/src/mcstrans.c
+index 96bdbdff..29cadb78 100644
+--- a/mcstrans/src/mcstrans.c
++++ b/mcstrans/src/mcstrans.c
+@@ -633,16 +633,23 @@ add_cache(domain_t *domain, char *raw, char *trans) {
+ 
+ 	map->raw = strdup(raw);
+ 	if (!map->raw) {
++		free(map);
+ 		goto err;
+ 	}
+ 	map->trans = strdup(trans);
+ 	if (!map->trans) {
++		free(map->raw);
++		free(map);
+ 		goto err;
+ 	}
+ 
+ 	log_debug(" add_cache (%s,%s)\n", raw, trans);
+-	if (add_to_hashtable(domain->raw_to_trans, map->raw, map) < 0)
++	if (add_to_hashtable(domain->raw_to_trans, map->raw, map) < 0) {
++		free(map->trans);
++		free(map->raw);
++		free(map);
+ 		goto err;
++	}
+ 
+ 	if (add_to_hashtable(domain->trans_to_raw, map->trans, map) < 0)
+ 		goto err;
+@@ -1519,6 +1526,7 @@ trans_context(const security_context_t incon, security_context_t *rcon) {
+ 			trans = compute_trans_from_raw(range, domain);
+ 			if (trans)
+ 				if (add_cache(domain, range, trans) < 0) {
++					free(trans);
+ 					free(range);
+ 					return -1;
+ 				}
+@@ -1530,6 +1538,7 @@ trans_context(const security_context_t incon, security_context_t *rcon) {
+ 				ltrans = compute_trans_from_raw(lrange, domain);
+ 				if (ltrans) {
+ 					if (add_cache(domain, lrange, ltrans) < 0) {
++						free(ltrans);
+ 						free(range);
+ 						return -1;
+ 					}
+@@ -1548,6 +1557,7 @@ trans_context(const security_context_t incon, security_context_t *rcon) {
+ 				utrans = compute_trans_from_raw(urange, domain);
+ 				if (utrans) {
+ 					if (add_cache(domain, urange, utrans) < 0) {
++						free(utrans);
+ 						free(ltrans);
+ 						free(range);
+ 						return -1;
+@@ -1647,7 +1657,9 @@ untrans_context(const security_context_t incon, security_context_t *rcon) {
+ 					canonical = compute_trans_from_raw(raw, domain);
+ 					if (canonical && strcmp(canonical, range))
+ 						if (add_cache(domain, raw, canonical) < 0) {
++							free(canonical);
+ 							free(range);
++							free(raw);
+ 							return -1;
+ 						}
+ 				}
+@@ -1655,6 +1667,7 @@ untrans_context(const security_context_t incon, security_context_t *rcon) {
+ 					free(canonical);
+ 				if (add_cache(domain, raw, range) < 0) {
+ 					free(range);
++					free(raw);
+ 					return -1;
+ 				}
+ 			} else {
+@@ -1672,6 +1685,7 @@ untrans_context(const security_context_t incon, security_context_t *rcon) {
+ 						canonical = compute_trans_from_raw(lraw, domain);
+ 						if (canonical)
+ 							if (add_cache(domain, lraw, canonical) < 0) {
++								free(canonical);
+ 								free(lraw);
+ 								free(range);
+ 								return -1;
+@@ -1703,6 +1717,7 @@ untrans_context(const security_context_t incon, security_context_t *rcon) {
+ 						canonical = compute_trans_from_raw(uraw, domain);
+ 						if (canonical)
+ 							if (add_cache(domain, uraw, canonical) < 0) {
++								free(canonical);
+ 								free(uraw);
+ 								free(lraw);
+ 								free(range);
+diff --git a/mcstrans/src/mcstransd.c b/mcstrans/src/mcstransd.c
+index 85899493..a1ec81ac 100644
+--- a/mcstrans/src/mcstransd.c
++++ b/mcstrans/src/mcstransd.c
+@@ -335,6 +335,7 @@ process_events(struct pollfd **ufds, int *nfds)
+ 					/* Setup pollfd for deletion later. */
+ 					(*ufds)[ii].fd = -1;
+ 					close(connfd);
++					connfd = -1;
+ 					/* So we don't get bothered later */
+ 					revents = revents & ~(POLLHUP);
+ 				}
+@@ -348,10 +349,11 @@ process_events(struct pollfd **ufds, int *nfds)
+ 			/* Set the pollfd up for deletion later. */
+ 			(*ufds)[ii].fd = -1;
+ 			close(connfd);
++			connfd = -1;
+ 
+ 			revents = revents & ~(POLLHUP);
+ 		}
+-		if (revents) {
++		if (revents && connfd != -1) {
+ 			syslog(LOG_ERR, "Unknown/error events (%x) encountered"
+ 					" for fd (%d)\n", revents, connfd);
+ 
+-- 
+2.21.0
+

SOURCES/0002-mcstrans-Do-not-accept-incomplete-contexts.patch

@@ -0,0 +1,59 @@
+From 659cb59cd6cfe36c954c77f945c06a0cd8218287 Mon Sep 17 00:00:00 2001
+From: Petr Lautrbach <plautrba@redhat.com>
+Date: Mon, 15 Apr 2019 15:22:51 +0200
+Subject: [PATCH] mcstrans: Do not accept incomplete contexts
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+$ python3
+> import selinux
+> selinux.selinux_raw_context_to_color("xyz_u:xyz_r:xyz_t:")
+
+Traceback (most recent call last):
+  File "<stdin>", line 2, in <module>
+OSError: [Errno 0] Error
+
+:: [ 10:25:45 ] :: [  BEGIN   ] :: Running 'service mcstransd status'
+Redirecting to /bin/systemctl status mcstransd.service
+● mcstrans.service - Translates SELinux MCS/MLS labels to human readable form
+   Loaded: loaded (/usr/lib/systemd/system/mcstrans.service; disabled; vendor preset: disabled)
+   Active: failed (Result: core-dump) since Fri 2019-04-12 10:25:44 EDT; 1s ago
+  Process: 16681 ExecStart=/sbin/mcstransd -f (code=dumped, signal=SEGV)
+ Main PID: 16681 (code=dumped, signal=SEGV)
+
+systemd[1]: mcstrans.service: Main process exited, code=dumped, status=11/SEGV
+systemd[1]: mcstrans.service: Failed with result 'core-dump'.
+
+Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
+---
+ mcstrans/src/mcscolor.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/mcstrans/src/mcscolor.c b/mcstrans/src/mcscolor.c
+index 6ea1aa97..79fc1c8b 100644
+--- a/mcstrans/src/mcscolor.c
++++ b/mcstrans/src/mcscolor.c
+@@ -272,10 +272,14 @@ static const unsigned precedence[N_COLOR][N_COLOR - 1] = {
+ static const secolor_t default_color = { 0x000000, 0xffffff };
+ 
+ static int parse_components(context_t con, char **components) {
+-	components[COLOR_USER] = (char *)context_user_get(con);
+-	components[COLOR_ROLE] = (char *)context_role_get(con);
+-	components[COLOR_TYPE] = (char *)context_type_get(con);
+-	components[COLOR_RANGE] = (char *)context_range_get(con);
++	if ((components[COLOR_USER] = (char *)context_user_get(con)) == NULL)
++		return -1;
++	if ((components[COLOR_ROLE] = (char *)context_role_get(con)) == NULL)
++		return -1;
++	if ((components[COLOR_TYPE] = (char *)context_type_get(con)) == NULL)
++		return -1;
++	if ((components[COLOR_RANGE] = (char *)context_range_get(con)) == NULL)
++		return -1;
+ 
+ 	return 0;
+ }
+-- 
+2.21.0
+

SOURCES/0003-Revert-mcstransd-select-correct-colour-range.patch

@@ -0,0 +1,56 @@
+From 7426ba3f8d9edc5222db5663c8a9e5312f489e92 Mon Sep 17 00:00:00 2001
+From: Vit Mojzis <vmojzis@redhat.com>
+Date: Tue, 2 Jul 2019 14:09:04 +0200
+Subject: [PATCH] Revert "mcstransd select correct colour range."
+
+This reverts commit fe17b3d2d924018750386c5ee74f12ca4b054136.
+
+MLS ranges should be compared based on dominance.
+
+This fixes mlscolor-test on mcstrans examples.
+
+Eg. mlscolor-test using /usr/share/mcstrans/examples/urcsts when executed on mls
+machine fails as follows:
+
+\#pushd /usr/share/mcstrans/examples/urcsts
+\#cp -f secolor.conf /etc/selinux/mls/secolor.conf
+\#cp -f setrans.conf /etc/selinux/mls/setrans.conf
+\#systemctl restart mcstransd
+\#python3 /usr/share/mcstrans/util/mlscolor-test urcsts.color
+For 'system_u:system_r:inetd_t:SystemLow' got
+	'#000000 #000000 #000000 #000000 #000000 #000000 #000000 #000000' expected
+	'#000000 #000000 #000000 #000000 #000000 #000000 #000000 #008000'
+...
+mlscolor-test done with 19 errors
+
+Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
+---
+ mcstrans/src/mcscolor.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/mcstrans/src/mcscolor.c b/mcstrans/src/mcscolor.c
+index 79fc1c8b..f9c64da3 100644
+--- a/mcstrans/src/mcscolor.c
++++ b/mcstrans/src/mcscolor.c
+@@ -134,12 +134,12 @@ static const secolor_t *find_color(int idx, const char *component,
+ 	}
+ 
+ 	while (ptr) {
+-		if (fnmatch(ptr->pattern, component, 0) == 0) {
+-			if (idx == COLOR_RANGE) {
+-			    if (check_dominance(ptr->pattern, raw) == 0)
+-					return &ptr->color;
+-			} else 
+-				return &ptr->color;
++		if (idx == COLOR_RANGE) {
++		    if (check_dominance(ptr->pattern, raw) == 0)
++			return &ptr->color;
++		} else {
++		    if (fnmatch(ptr->pattern, component, 0) == 0)
++			return &ptr->color;
+ 		}
+ 		ptr = ptr->next;
+ 	}
+-- 
+2.21.0
+

SOURCES/0004-Fix-mcstrans-secolor-examples.patch

@@ -0,0 +1,44 @@
+From 90a4f2b9a5194a2d1ab4c45b7a90bbb6c8099a68 Mon Sep 17 00:00:00 2001
+From: Vit Mojzis <vmojzis@redhat.com>
+Date: Tue, 2 Jul 2019 14:09:05 +0200
+Subject: [PATCH] Fix mcstrans secolor examples
+
+According to "check_dominance" function:
+Range defined as "s15:c0.c1023" does not dominate any other range than
+ "s15:c0.c1023" (does not dominate "s15", "s15:c0.c200", etc.).
+While range defined as "s15-s15:c0.c1023" dominates all of the above.
+
+This is either a bug, or "s15:c0.c1023" should not be used in the
+examples.
+
+Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
+---
+ mcstrans/share/examples/urcsts-via-include/secolor.conf | 2 +-
+ mcstrans/share/examples/urcsts/secolor.conf             | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mcstrans/share/examples/urcsts-via-include/secolor.conf b/mcstrans/share/examples/urcsts-via-include/secolor.conf
+index d35b3c67..3b3f5430 100644
+--- a/mcstrans/share/examples/urcsts-via-include/secolor.conf
++++ b/mcstrans/share/examples/urcsts-via-include/secolor.conf
+@@ -17,5 +17,5 @@ range s3-s3:c0.c1023 = black tan
+ range s5-s5:c0.c1023 = white blue
+ range s7-s7:c0.c1023 = black red
+ range s9-s9:c0.c1023 = black orange
+-range s15:c0.c1023 = black yellow
++range s15-s15:c0.c1023 = black yellow
+ 
+diff --git a/mcstrans/share/examples/urcsts/secolor.conf b/mcstrans/share/examples/urcsts/secolor.conf
+index d35b3c67..3b3f5430 100644
+--- a/mcstrans/share/examples/urcsts/secolor.conf
++++ b/mcstrans/share/examples/urcsts/secolor.conf
+@@ -17,5 +17,5 @@ range s3-s3:c0.c1023 = black tan
+ range s5-s5:c0.c1023 = white blue
+ range s7-s7:c0.c1023 = black red
+ range s9-s9:c0.c1023 = black orange
+-range s15:c0.c1023 = black yellow
++range s15-s15:c0.c1023 = black yellow
+ 
+-- 
+2.21.0
+

SPECS/mcstrans.spec

@@ -1,24 +1,25 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
-Version: 3.5
+Version: 2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL+
 Url: https://github.com/SELinuxProject/selinux/wiki
-Source: https://github.com/SELinuxProject/selinux/releases/download/3.5/mcstrans-3.5.tar.gz
+Source: https://github.com/SELinuxProject/selinux/releases/download/20190315/mcstrans-2.9.tar.gz
 Source2: secolor.conf.8
-# fedora-selinux/selinux: git format-patch -N 3.5 -- mcstrans
 # i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done
-# Patch list start
+Patch0001: 0001-mcstrans-Fir-RESOURCE_LEAK-and-USE_AFTER_FREE-coveri.patch
-# Patch list end
+Patch0002: 0002-mcstrans-Do-not-accept-incomplete-contexts.patch
+Patch0003: 0003-Revert-mcstransd-select-correct-colour-range.patch
+Patch0004: 0004-Fix-mcstrans-secolor-examples.patch
 BuildRequires: gcc
-BuildRequires: make
 BuildRequires: libselinux-devel >= %{version}
-BuildRequires: libcap-devel pcre2-devel libsepol-devel libsepol-static
+BuildRequires: libcap-devel pcre-devel libsepol-devel libsepol-static
 BuildRequires: systemd
-Requires: pcre2
+Requires: pcre
 %{?systemd_requires}
 Provides: setransd
 Provides: libsetrans
+Obsoletes: libsetrans
 
 %description
 Security-enhanced Linux is a feature of the Linux® kernel and a number
@@ -39,17 +40,15 @@ from internal representations to user defined representation.
 
 %build
 %set_build_flags
-
+make LIBDIR="%{_libdir}" %{?_smp_mflags}
-%make_build LIBDIR="%{_libdir}"
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}/%{_lib}
 mkdir -p %{buildroot}/%{_libdir}
 mkdir -p %{buildroot}%{_usr}/share/mcstrans
 mkdir -p %{buildroot}%{_sysconfdir}/selinux/mls/setrans.d
 
-%make_install LIBDIR="%{_libdir}" SHLIBDIR="%{_lib}" SBINDIR="%{_sbindir}"
+make DESTDIR="%{buildroot}" LIBDIR="%{_libdir}" SHLIBDIR="%{_lib}" SBINDIR="%{_sbindir}" install
 rm -f %{buildroot}%{_libdir}/*.a
 cp -r share/* %{buildroot}%{_usr}/share/mcstrans/
 # Systemd 
@@ -58,6 +57,9 @@ ln -s %{_unitdir}/mcstrans.service %{buildroot}/%{_unitdir}/mcstransd.service
 rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/mcstrans
 install -m644 %{SOURCE2} %{buildroot}%{_mandir}/man8/
 
+%clean
+rm -rf %{buildroot}
+
 %post 
 %systemd_post mcstransd.service
 
@@ -68,12 +70,13 @@ install -m644 %{SOURCE2} %{buildroot}%{_mandir}/man8/
 %systemd_postun mcstransd.service
 
 %files
+%defattr(-,root,root,0755)
 %{_mandir}/man8/mcs.8.gz
 %{_mandir}/man8/mcstransd.8.gz
-%{_mandir}/man5/setrans.conf.5.gz
+%{_mandir}/man8/setrans.conf.8.gz
 %{_mandir}/ru/man8/mcs.8.gz
 %{_mandir}/ru/man8/mcstransd.8.gz
-%{_mandir}/ru/man5/setrans.conf.5.gz
+%{_mandir}/ru/man8/setrans.conf.8.gz
 %{_mandir}/man8/secolor.conf.8.gz
 /usr/sbin/mcstransd
 %{_unitdir}/mcstrans.service
@@ -91,98 +94,22 @@ install -m644 %{SOURCE2} %{buildroot}%{_mandir}/man8/
 %{_usr}/share/mcstrans/util/*
 
 %changelog
-* Thu Feb 23 2023 Petr Lautrbach <lautrbach@redhat.com> - 3.5-1
+* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2.9-2
-- SELinux userspace 3.5 release
+- Rebuilt for MSVSphere 8.8
-
-* Wed Feb 15 2023 Petr Lautrbach <lautrbach@redhat.com> - 3.5-0.rc3.1
-- SELinux userspace 3.5-rc3 release
-
-* Tue Jan 17 2023 Petr Lautrbach <lautrbach@redhat.com> - 3.5-0.rc2.1
-- SELinux userspace 3.5-rc2 release
-
-* Mon Jan  2 2023 Petr Lautrbach <lautrbach@redhat.com> - 3.5-0.rc1.1
-- SELinux userspace 3.5-rc1 release
-
-* Fri May 20 2022 Petr Lautrbach <plautrba@redhat.com> - 3.4-1
-- SELinux userspace 3.4 release
-
-* Fri Dec 10 2021 Petr Lautrbach <plautrba@redhat.com> - 3.3-2
-- Port to new PCRE2 from end-of-life PCRE
-
-* Fri Oct 22 2021 Petr Lautrbach <plautrba@redhat.com> - 3.3-1
-- SELinux userspace 3.3 release
-
-* Mon Oct 11 2021 Petr Lautrbach <plautrba@redhat.com> - 3.3-0.rc3.1
-- SELinux userspace 3.3-rc3 release
-
-* Wed Sep 29 2021 Petr Lautrbach <plautrba@redhat.com> - 3.3-0.rc2.1
-- SELinux userspace 3.3-rc2 release
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.2-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Aug  5 2021 Petr Lautrbach <plautrba@redhat.com> - 3.2-3
-- Fix RESOURCE_LEAK (CWE-772)
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.2-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Tue Mar  9 2021 Petr Lautrbach <plautrba@redhat.com> - 3.2-1
+* Fri Nov 08 2019 Vit Mojzis <vmojzis@redhat.com> - 2.9-2
-- SELinux userspace 3.2 release
+- Revert "mcstransd select correct colour range." (#1731451)
+- Fix mcstrans secolor examples (#1731451)
 
-* Sun Feb  7 2021 Petr Lautrbach <plautrba@redhat.com> - 3.2-0.rc2.1
+* Fri Apr 12 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-1.2
-- SELinux userspace 3.2-rc2 release
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-0.rc1.1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 22 2021 Petr Lautrbach <plautrba@redhat.com> - 3.2-0.rc1.1
-- SELinux userspace 3.2-rc1 release
-
-* Tue Jul 28 2020 Tom Stellard <tstellar@redhat.com> - 3.1-3
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 16 2020 Petr Lautrbach <plautrba@redhat.com> - 3.1-1
-- SELinux userspace 3.1 release
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Dec  6 2019 Petr Lautrbach <plautrba@redhat.com> - 3.0-1
-- SELinux userspace 3.0 release
-
-* Mon Nov 11 2019 Petr Lautrbach <plautrba@redhat.com> - 3.0-0.rc1.1
-- SELinux userspace 3.0-rc1 release candidate
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Mar 19 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-1
 - SELinux userspace 2.9 release
 
-* Mon Mar 11 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-0.rc2.1
+* Sun Dec 16 2018 Petr Lautrbach <plautrba@redhat.com> - 2.8-2
-- SELinux userspace 2.9-rc2 release
+- Fix RESOURCE_LEAK and USE_AFTER_FREE coverity scan defects
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-0.rc1.1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 30 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-0.rc1.1
-- Update to mcstrans-2.9-rc1
 
 * Tue Oct  2 2018 Petr Lautrbach <plautrba@redhat.com> - 2.8-1
 - Update to mcstrans-2.8
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild