diff --git a/backport-libselinux-add-check-for-calloc-in-check_booleans.patch b/backport-libselinux-add-check-for-calloc-in-check_booleans.patch deleted file mode 100644 index a1f6cb3389276a0a7f475ab593e0cfdf4f36fc75..0000000000000000000000000000000000000000 --- a/backport-libselinux-add-check-for-calloc-in-check_booleans.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d8edd363be3184c5738438fde937fd5ebc2d4923 Mon Sep 17 00:00:00 2001 -From: Huaxin Lu -Date: Mon, 19 Jun 2023 07:17:02 +0800 -Subject: [PATCH] libselinux: add check for calloc in check_booleans - -Check the return value of calloc() to avoid null pointer reference. - -Signed-off-by: Huaxin Lu -Acked-by: Petr Lautrbach ---- - src/audit2why.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/audit2why.c b/src/audit2why.c -index ba1a66eb..8c4c07d5 100644 ---- a/src/audit2why.c -+++ b/src/audit2why.c -@@ -149,6 +149,12 @@ static int check_booleans(struct boolean_t **bools) - - if (fcnt > 0) { - *bools = calloc(sizeof(struct boolean_t), fcnt + 1); -+ if (!*bools) { -+ PyErr_SetString( PyExc_MemoryError, "Out of memory\n"); -+ free(foundlist); -+ return 0; -+ } -+ - struct boolean_t *b = *bools; - for (i = 0; i < fcnt; i++) { - int ctr = foundlist[i]; --- -2.27.0 - diff --git a/do-malloc-trim-after-load-policy.patch b/do-malloc-trim-after-load-policy.patch index e4eb7f26a05431c0628e06ddf3a850270d065689..ad5f9c9729e028ca8674e4e6bdce876ce4991599 100644 --- a/do-malloc-trim-after-load-policy.patch +++ b/do-malloc-trim-after-load-policy.patch @@ -1,35 +1,27 @@ -From 3d5049f849226d54070651fdf96019d263c38363 Mon Sep 17 00:00:00 2001 -From: luhuaxin <1539327763@qq.com> -Date: Wed, 2 Jun 2021 16:24:47 +0800 +From 1ebdd5fb10f30ab3f8f0e083bf83879f82bd047e Mon Sep 17 00:00:00 2001 +From: zhangxingrong +Date: Tue, 16 Jan 2024 14:32:07 +0800 Subject: [PATCH] do malloc trim after load policy --- - src/load_policy.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + libselinux/src/load_policy.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/src/load_policy.c b/src/load_policy.c -index 2aea826..ace898c 100644 ---- a/src/load_policy.c -+++ b/src/load_policy.c -@@ -18,6 +18,7 @@ - #include - #include "policy.h" - #include -+#include - - #ifndef MNT_DETACH - #define MNT_DETACH 2 -@@ -365,7 +366,9 @@ int selinux_init_load_policy(int *enforce) +diff --git a/libselinux/src/load_policy.c b/libselinux/src/load_policy.c +index 57d7aae..0b2d875 100644 +--- a/libselinux/src/load_policy.c ++++ b/libselinux/src/load_policy.c +@@ -365,7 +365,9 @@ int selinux_init_load_policy(int *enforce) } /* Load the policy. */ - return selinux_mkload_policy(0); -+ rc = selinux_mkload_policy(0); -+ malloc_trim(0); -+ return rc; ++ rc = selinux_mkload_policy(0); ++ malloc_trim(0); ++ return rc; noload: /* -- -1.8.3.1 +2.33.0 diff --git a/libselinux-3.5.tar.gz b/libselinux-3.5.tar.gz deleted file mode 100644 index 2916882feaee3b67e9b8cdead4e046847b3032fa..0000000000000000000000000000000000000000 Binary files a/libselinux-3.5.tar.gz and /dev/null differ diff --git a/libselinux-3.6.tar.gz b/libselinux-3.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8f1f7672c1e11d3315819af2c6555ebbb8db089a Binary files /dev/null and b/libselinux-3.6.tar.gz differ diff --git a/libselinux.spec b/libselinux.spec index b177550f79531c9291ff1310a05b9947712ac492..45b37117d669150152c4d3de6be1bc8093fa4bf5 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -2,14 +2,13 @@ %global libsepol_version 3.5 Name: libselinux -Version: 3.5 -Release: 2 +Version: 3.6 +Release: 1 License: Public Domain Summary: SELinux library and simple utilities Url: https://github.com/SELinuxProject/selinux/wiki Source0: https://github.com/SELinuxProject/selinux/releases/download/%{version}/libselinux-%{version}.tar.gz -Patch0001: backport-libselinux-add-check-for-calloc-in-check_booleans.patch Patch9000: do-malloc-trim-after-load-policy.patch BuildRequires: gcc python3-devel systemd swig pcre2-devel xz-devel @@ -129,6 +128,10 @@ mv %{buildroot}%{_sbindir}/getconlist %{buildroot}%{_sbindir}/selinuxconlist %{_mandir}/ru/man8/* %changelog +* Tue Jan 16 2024 zhangxingrong - 3.6-1 +- upgrade to 3.6 +- do malloc trim after load policy + * Tue Jul 25 2023 luhuaxin - 3.5-2 - add check for calloc in check_booleans - fix python build issue