fix null ops may cause coredump
Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
This commit is contained in:
parent
0de21982dc
commit
2d10b2cdf7
32
0025-fix-ops-hierarchies-cause-coredump.patch
Normal file
32
0025-fix-ops-hierarchies-cause-coredump.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From 636f30e34dd33a0b888faa9675fe33fb5aa0ad7a Mon Sep 17 00:00:00 2001
|
||||
From: "Neil.wrz" <wangrunze13@huawei.com>
|
||||
Date: Tue, 21 Feb 2023 22:48:44 -0800
|
||||
Subject: [PATCH] may cause coredump
|
||||
|
||||
---
|
||||
src/lxc/cgroups/isulad_cgfsng.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/src/lxc/cgroups/isulad_cgfsng.c b/src/lxc/cgroups/isulad_cgfsng.c
|
||||
index 6ccff63..dcaa229 100644
|
||||
--- a/src/lxc/cgroups/isulad_cgfsng.c
|
||||
+++ b/src/lxc/cgroups/isulad_cgfsng.c
|
||||
@@ -938,8 +938,15 @@ __cgfsng_ops static inline bool isulad_cgfsng_payload_create(struct cgroup_ops *
|
||||
struct lxc_handler *handler)
|
||||
{
|
||||
int i;
|
||||
+
|
||||
+ if (!ops)
|
||||
+ return ret_set_errno(false, ENOENT);
|
||||
+
|
||||
char *container_cgroup = ops->container_cgroup;
|
||||
|
||||
+ if (!ops->hierarchies)
|
||||
+ return true;
|
||||
+
|
||||
#ifdef HAVE_ISULAD
|
||||
if (ops->no_controller) {
|
||||
DEBUG("no controller found, isgnore isulad_cgfsng_payload_create");
|
||||
--
|
||||
2.25.1
|
||||
|
||||
9
lxc.spec
9
lxc.spec
@ -1,4 +1,4 @@
|
||||
%global _release 2022102411
|
||||
%global _release 2022102412
|
||||
|
||||
Name: lxc
|
||||
Version: 4.0.3
|
||||
@ -32,6 +32,7 @@ Patch0021: 0021-change-the-suffi-parameter-in-lxc-attach-help-output.patch
|
||||
Patch0022: 0022-fix-cve-CVE-2022-47952-log-leaks-root-information.patch
|
||||
Patch0023: 0023-fix-lxc-write-error-message.patch
|
||||
Patch0024: 0024-remove-process-inheritable-capability.patch
|
||||
Patch0025: 0025-fix-ops-hierarchies-cause-coredump.patch
|
||||
|
||||
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
|
||||
BuildRequires: pkgconfig(libseccomp)
|
||||
@ -218,6 +219,12 @@ rm -rf %{buildroot}%{_sysconfdir}/default/%{name}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Feb 22 2023 wangrunze<wangrunze13@huawei.com> - 4.0.3-2022102412
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: fix ops hierarchies cause coredump
|
||||
|
||||
* Wed Feb 22 2023 misaka00251 <liuxin@iscas.ac.cn> - 4.0.3-2022102411
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user