diff --git a/backport-libselinux-Fix-potential-undefined-shifts.patch b/backport-libselinux-Fix-potential-undefined-shifts.patch deleted file mode 100644 index 38c67ea7883c6a72b725a1c79a25a208d1b0bcdf..0000000000000000000000000000000000000000 --- a/backport-libselinux-Fix-potential-undefined-shifts.patch +++ /dev/null @@ -1,135 +0,0 @@ -From c3ad59cc975d4848b6af37cbcb5caeb6fcb9bdb4 Mon Sep 17 00:00:00 2001 -From: James Carter -Date: Fri, 8 Oct 2021 15:07:36 -0400 -Reference:https://github.com/SELinuxProject/selinux/commit/c3ad59cc975d4848b6af37cbcb5caeb6fcb9bdb4 -Conflict:adapter filepath -Subject: [PATCH] libselinux: Fix potential undefined shifts - -An expression of the form "1 << x" is undefined if x == 31 because -the "1" is an int and cannot be left shifted by 31. - -Instead, use "UINT32_C(1) << x" which will be an unsigned int of -at least 32 bits. - -Signed-off-by: James Carter -Signed-off-by: lujie42 ---- - src/mapping.c | 22 +++++++++++----------- - src/stringrep.c | 8 ++++---- - 2 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/src/mapping.c b/src/mapping.c -index 96395fd4..dd2f1039 100644 ---- a/src/mapping.c -+++ b/src/mapping.c -@@ -144,9 +144,9 @@ unmap_perm(security_class_t tclass, access_vector_t tperm) - access_vector_t kperm = 0; - - for (i = 0; i < current_mapping[tclass].num_perms; i++) -- if (tperm & (1<allowed & mapping->perms[i]) -- result |= 1<perms[i]) -- result |= 1<allowed = result; - - for (i = 0, result = 0; i < n; i++) { - if (avd->decided & mapping->perms[i]) -- result |= 1<perms[i]) -- result |= 1<decided = result; - - for (i = 0, result = 0; i < n; i++) - if (avd->auditallow & mapping->perms[i]) -- result |= 1<auditallow = result; - - for (i = 0, result = 0; i < n; i++) { - if (avd->auditdeny & mapping->perms[i]) -- result |= 1<perms[i]) -- result |= 1<auditdeny = result; - } - } -diff --git a/src/stringrep.c b/src/stringrep.c -index 012a740a..2fe69f43 100644 ---- a/src/stringrep.c -+++ b/src/stringrep.c -@@ -229,7 +229,7 @@ access_vector_t string_to_av_perm(security_class_t tclass, const char *s) - size_t i; - for (i = 0; i < MAXVECTORS && node->perms[i] != NULL; i++) - if (strcmp(node->perms[i],s) == 0) -- return map_perm(tclass, 1<perms[i]; - - return NULL; -@@ -279,7 +279,7 @@ int security_av_string(security_class_t tclass, access_vector_t av, char **res) - /* first pass computes the required length */ - for (i = 0; tmp; tmp >>= 1, i++) { - if (tmp & 1) { -- str = security_av_perm_to_string(tclass, av & (1<>= 1, i++) { - if (tmp & 1) { -- str = security_av_perm_to_string(tclass, av & (1< - 3.3-1 +- update libselinux-3.1 to libselinux-3.3 + * Tue Nov 16 2021 lujie - 3.1-4 - fix potential undefined shifts -* Wed Jul 2 2021 luhuaxin <1539327763@qq.com> - 3.1-3 +* Fri Jul 2 2021 luhuaxin <1539327763@qq.com> - 3.1-3 - do malloc trim after load policy * Tue Oct 27 2020 gaoyusong - 3.1-2