seccomp: init and destroy notifier.cookie

Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
This commit is contained in:
zhangxiaoyu 2021-09-17 11:15:36 +08:00
parent 7cb716f865
commit d65f948028
3 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,37 @@
From aca2dde947317d4e3c1a75ec7fdebf2ae70878a2 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Thu, 15 Apr 2021 07:09:10 +0000
Subject: [PATCH] seccomp: init and destroy notifier.cookie
It's a follow-up to 84cf6d259b24e4ad48e
Closes https://github.com/lxc/lxc/issues/3806
Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>
---
src/lxc/seccomp.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
index 4b9d23c55..ebbba80f7 100644
--- a/src/lxc/seccomp.c
+++ b/src/lxc/seccomp.c
@@ -1867,6 +1867,7 @@ void lxc_seccomp_free(struct lxc_seccomp *seccomp)
seccomp_notify_free(seccomp->notifier.req_buf, seccomp->notifier.rsp_buf);
seccomp->notifier.req_buf = NULL;
seccomp->notifier.rsp_buf = NULL;
+ free_disarm(seccomp->notifier.cookie);
#endif
}
@@ -2076,6 +2077,7 @@ void seccomp_conf_init(struct lxc_conf *conf)
sizeof(conf->seccomp.notifier.proxy_addr));
conf->seccomp.notifier.req_buf = NULL;
conf->seccomp.notifier.rsp_buf = NULL;
+ conf->seccomp.notifier.cookie = NULL;
#endif
}
--
2.25.1

View File

@ -1,4 +1,4 @@
%global _release 2021082601
%global _release 2021091701
Name: lxc
Version: 4.0.3
@ -35,6 +35,7 @@ Patch0024: 0024-log-adjust-log-level-from-error-to-warn.patch
Patch0025: 0025-get-cgroup-data-len-first-and-malloc-read-buff-by-le.patch
Patch0026: 0026-coredump-fix-coredump-when-cgroup-get-return-error.patch
Patch0027: 0027-add-help-for-new-arguments.patch
Patch0028: 0028-seccomp-init-and-destroy-notifier.cookie.patch
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
BuildRequires: pkgconfig(libseccomp)
@ -206,6 +207,12 @@ make check
%{_mandir}/*/man7/%{name}*
%changelog
* Fri Sep 17 2021 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.0.3-2021091701
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:seccomp init and destroy notifier.cookie
* Thu Aug 26 2021 haozi007 <liuhao27@huawei.com> - 4.0.3-2021082601
- Type:bugfix
- ID:NA

View File

@ -25,3 +25,4 @@
0025-get-cgroup-data-len-first-and-malloc-read-buff-by-le.patch
0026-coredump-fix-coredump-when-cgroup-get-return-error.patch
0027-add-help-for-new-arguments.patch
0028-seccomp-init-and-destroy-notifier.cookie.patch