packages/lxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!331 do not check rootfs.path, it may be null if rootfs is "/"

Browse Source 
From: @wangfengtu 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
This commit is contained in:
openeuler-ci-bot 2022-08-20 07:38:12 +00:00 committed by Gitee
commit ced8e24cd9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0013-return-fail-if-no-args-or-no-rootfs-path-found.patch
View File

@ -1,4 +1,4 @@
From ee2a2242a009627fe6edd89f4624d8eb6dd1756c Mon Sep 17 00:00:00 2001 From a2aff3425a6f35bdb9f83880a1545b89606bf7c9 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com> From: WangFengTu <wangfengtu@huawei.com>
Date: Fri, 19 Aug 2022 14:32:22 +0800 Date: Fri, 19 Aug 2022 14:32:22 +0800
Subject: [PATCH] return fail if no args or no rootfs path found Subject: [PATCH] return fail if no args or no rootfs path found
@ -9,7 +9,7 @@ Signed-off-by: WangFengTu <wangfengtu@huawei.com>
1 file changed, 14 insertions(+) 1 file changed, 14 insertions(+)
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 3f75184..2133782 100644 index 3f75184..4b669bb 100644
--- a/src/lxc/lxccontainer.c --- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c
@@ -1030,6 +1030,20 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a @@ -1030,6 +1030,20 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
@ -17,7 +17,7 @@ index 3f75184..2133782 100644
} }
+ // do not allow using default rootfs path when isulad + // do not allow using default rootfs path when isulad
+ if (conf->rootfs.mount == NULL || conf->rootfs.path == NULL) { + if (conf->rootfs.mount == NULL) {
+ ERROR("Empty rootfs path detected"); + ERROR("Empty rootfs path detected");
+ lxc_put_handler(handler); + lxc_put_handler(handler);
+ return false; + return false;

26
0014-do-not-check-rootfs.path-it-may-be-null-if-rootfs-is.patch
View File

@ -1,26 +0,0 @@
From 781ccccd4074b3b998e7085729409ed1beacf828 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Sat, 20 Aug 2022 14:46:36 +0800
Subject: [PATCH] do not check rootfs.path, it may be null if rootfs is "/"
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
src/lxc/lxccontainer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 2133782..4b669bb 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1031,7 +1031,7 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
}
// do not allow using default rootfs path when isulad
- if (conf->rootfs.mount == NULL || conf->rootfs.path == NULL) {
+ if (conf->rootfs.mount == NULL) {
ERROR("Empty rootfs path detected");
lxc_put_handler(handler);
return false;
--
2.25.1

1
lxc.spec
View File

@ -21,7 +21,6 @@ Patch0010: 0010-check-yajl-only-when-have-isulad.patch
Patch0011: 0011-drop-security_context_t.patch Patch0011: 0011-drop-security_context_t.patch
Patch0012: 0012-only-set-user-or-image-set-non-empty-HOME.patch Patch0012: 0012-only-set-user-or-image-set-non-empty-HOME.patch
Patch0013: 0013-return-fail-if-no-args-or-no-rootfs-path-found.patch Patch0013: 0013-return-fail-if-no-args-or-no-rootfs-path-found.patch
Patch0014: 0014-do-not-check-rootfs.path-it-may-be-null-if-rootfs-is.patch
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libseccomp)