!47 [sync] PR-45: backport upstream patch
From: @openeuler-sync-bot Reviewed-by: @HuaxinLuGitee Signed-off-by: @HuaxinLuGitee
This commit is contained in:
commit
fbb0f79742
@ -0,0 +1,33 @@
|
|||||||
|
From d8edd363be3184c5738438fde937fd5ebc2d4923 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Huaxin Lu <luhuaxin1@huawei.com>
|
||||||
|
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 <luhuaxin1@huawei.com>
|
||||||
|
Acked-by: Petr Lautrbach <lautrbach@redhat.com>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: libselinux
|
Name: libselinux
|
||||||
Version: 3.3
|
Version: 3.3
|
||||||
Release: 3
|
Release: 4
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
Summary: SELinux library and simple utilities
|
Summary: SELinux library and simple utilities
|
||||||
Url: https://github.com/SELinuxProject/selinux/wiki
|
Url: https://github.com/SELinuxProject/selinux/wiki
|
||||||
@ -26,6 +26,7 @@ Patch6013: backport-libselinux-filter-arguments-with-path-separators.patch
|
|||||||
Patch6014: backport-libselinux-fix-some-memory-issues-in-db_init.patch
|
Patch6014: backport-libselinux-fix-some-memory-issues-in-db_init.patch
|
||||||
Patch6015: backport-libselinux-add-check-for-malloc.patch
|
Patch6015: backport-libselinux-add-check-for-malloc.patch
|
||||||
Patch6016: backport-libselinux-restore-use-fixed-sized-integer-for-hash-index.patch
|
Patch6016: backport-libselinux-restore-use-fixed-sized-integer-for-hash-index.patch
|
||||||
|
Patch6017: backport-libselinux-add-check-for-calloc-in-check_booleans.patch
|
||||||
|
|
||||||
Patch9000: do-malloc-trim-after-load-policy.patch
|
Patch9000: do-malloc-trim-after-load-policy.patch
|
||||||
|
|
||||||
@ -146,6 +147,9 @@ mv %{buildroot}%{_sbindir}/getconlist %{buildroot}%{_sbindir}/selinuxconlist
|
|||||||
%{_mandir}/ru/man8/*
|
%{_mandir}/ru/man8/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 11 2023 zhangguangzhi <zhangguangzhi3@huawei.com> - 3.3-4
|
||||||
|
- backport upstream patch
|
||||||
|
|
||||||
* Tue Jun 13 2023 zhangguangzhi <zhangguangzhi3@huawei.com> - 3.3-3
|
* Tue Jun 13 2023 zhangguangzhi <zhangguangzhi3@huawei.com> - 3.3-3
|
||||||
- backport upstream patches
|
- backport upstream patches
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user