From 56d14e8006d83937564534442153a6e2404c752f Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <lautrbach@redhat.com>
Date: Tue, 9 Jul 2024 21:36:54 +0200
Subject: [PATCH] libselinux-3.7-2

- set free'd data to NULL (#2295428)
Resolves: RHEL-46558
---
 0002-libselinux-set-free-d-data-to-NULL.patch | 78 +++++++++++++++++++
 changelog                                     |  3 +
 libselinux.spec                               |  3 +-
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 0002-libselinux-set-free-d-data-to-NULL.patch

diff --git a/0002-libselinux-set-free-d-data-to-NULL.patch b/0002-libselinux-set-free-d-data-to-NULL.patch
new file mode 100644
index 0000000..1473775
--- /dev/null
+++ b/0002-libselinux-set-free-d-data-to-NULL.patch
@@ -0,0 +1,78 @@
+From bd6a803553a82238a9f618d1bb22f288682f8195 Mon Sep 17 00:00:00 2001
+From: Petr Lautrbach <lautrbach@redhat.com>
+Date: Tue, 9 Jul 2024 21:13:36 +0200
+Subject: [PATCH] libselinux: set free'd data to NULL
+Content-type: text/plain
+
+Fixes segfault in selabel_open() on systems with SELinux disabled and without any
+SELinux policy installed introduced by commit 5876aca0484f ("libselinux: free
+data on selabel open failure"):
+
+    $ sestatus
+    SELinux status:                 disabled
+
+    $ cat /etc/selinux/config
+    cat: /etc/selinux/config: No such file or directory
+
+    $ matchpathcon /abc
+    [1]    907999 segmentation fault (core dumped)  matchpathcon /abc
+
+Signed-off-by: Petr Lautrbach <lautrbach@redhat.com>
+---
+ libselinux/src/label_backends_android.c | 1 +
+ libselinux/src/label_file.c             | 1 +
+ libselinux/src/label_media.c            | 1 +
+ libselinux/src/label_x.c                | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/libselinux/src/label_backends_android.c b/libselinux/src/label_backends_android.c
+index 49a87686de4c..5bad24f20d73 100644
+--- a/libselinux/src/label_backends_android.c
++++ b/libselinux/src/label_backends_android.c
+@@ -260,6 +260,7 @@ static void closef(struct selabel_handle *rec)
+ 		free(data->spec_arr);
+ 
+ 	free(data);
++	rec->data = NULL;
+ }
+ 
+ static struct selabel_lookup_rec *property_lookup(struct selabel_handle *rec,
+diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c
+index 6c6fe328b353..87dbd0e90f2b 100644
+--- a/libselinux/src/label_file.c
++++ b/libselinux/src/label_file.c
+@@ -942,6 +942,7 @@ static void closef(struct selabel_handle *rec)
+ 		free(last_area);
+ 	}
+ 	free(data);
++	rec->data = NULL;
+ }
+ 
+ // Finds all the matches of |key| in the given context. Returns the result in
+diff --git a/libselinux/src/label_media.c b/libselinux/src/label_media.c
+index 852aeada8ff4..bae065c12a55 100644
+--- a/libselinux/src/label_media.c
++++ b/libselinux/src/label_media.c
+@@ -183,6 +183,7 @@ static void close(struct selabel_handle *rec)
+ 	    free(spec_arr);
+ 
+ 	free(data);
++	rec->data = NULL;
+ }
+ 
+ static struct selabel_lookup_rec *lookup(struct selabel_handle *rec,
+diff --git a/libselinux/src/label_x.c b/libselinux/src/label_x.c
+index a8decc7a0093..ddae4f6c22b6 100644
+--- a/libselinux/src/label_x.c
++++ b/libselinux/src/label_x.c
+@@ -210,6 +210,7 @@ static void close(struct selabel_handle *rec)
+ 	    free(spec_arr);
+ 
+ 	free(data);
++	rec->data = NULL;
+ }
+ 
+ static struct selabel_lookup_rec *lookup(struct selabel_handle *rec,
+-- 
+2.45.2
+
diff --git a/changelog b/changelog
index 3a856df..f3f2284 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,6 @@
+* Tue Jul 09 2024 Petr Lautrbach <lautrbach@redhat.com> - 3.7-2
+- set free'd data to NULL (#2295428)
+
 * Thu Jun 27 2024 Petr Lautrbach <lautrbach@redhat.com> - 3.7-1
 - SELinux userspace 3.7 release
 
diff --git a/libselinux.spec b/libselinux.spec
index c1e4ef4..c303626 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -4,7 +4,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LicenseRef-Fedora-Public-Domain
 # https://github.com/SELinuxProject/selinux/wiki/Releases
 Source0: https://github.com/SELinuxProject/selinux/releases/download/3.7/libselinux-3.7.tar.gz
@@ -20,6 +20,7 @@ Url: https://github.com/SELinuxProject/selinux/wiki
 # $ i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done
 # Patch list start
 Patch0001: 0001-Use-SHA-2-instead-of-SHA-1.patch
+Patch0002: 0002-libselinux-set-free-d-data-to-NULL.patch
 # Patch list end
 BuildRequires: gcc make
 BuildRequires: ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre2-devel