35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
From c720232af726a79d6c5527d8ca96f0acd9772730 Mon Sep 17 00:00:00 2001
|
||
|
|
From: wujing <wujing50@huawei.com>
|
||
|
|
Date: Thu, 25 Mar 2021 16:44:45 +0800
|
||
|
|
Subject: [PATCH] fix coredump when inspect container when daemon sets the
|
||
|
|
ulimit parameters
|
||
|
|
|
||
|
|
Signed-off-by: wujing <wujing50@huawei.com>
|
||
|
|
---
|
||
|
|
src/daemon/modules/service/inspect_container.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/daemon/modules/service/inspect_container.c b/src/daemon/modules/service/inspect_container.c
|
||
|
|
index abfb8517..d678f7bb 100644
|
||
|
|
--- a/src/daemon/modules/service/inspect_container.c
|
||
|
|
+++ b/src/daemon/modules/service/inspect_container.c
|
||
|
|
@@ -517,7 +517,7 @@ static container_inspect *pack_inspect_data(const container_t *cont, bool with_h
|
||
|
|
ERROR("Failed to pack inspect host config data, continue to pack other information");
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (merge_default_ulimit_with_ulimit(inspect) != 0) {
|
||
|
|
+ if (with_host_config && merge_default_ulimit_with_ulimit(inspect) != 0) {
|
||
|
|
ERROR("Failed to pack default ulimit data, continue to pack other information");
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -622,4 +622,4 @@ out:
|
||
|
|
inspect = NULL;
|
||
|
|
}
|
||
|
|
return inspect;
|
||
|
|
-}
|
||
|
|
\ No newline at end of file
|
||
|
|
+}
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|