[RESEND,v1,25/55] pstree: Add pid_ns check in read_pstree_image

Submitted by Kirill Tkhai on March 24, 2017, 3:13 p.m.

Details

Message ID 149036838217.23093.12750297366817332244.stgit@localhost.localdomain
State New
Series "Nested pid namespaces support"
Headers show

Commit Message

Kirill Tkhai March 24, 2017, 3:13 p.m.
Sanity check, that we have pid_ns_id. As we dump pid_ns_id
since ids are implemented, they must be always.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 criu/pstree.c |    9 +++++++++
 1 file changed, 9 insertions(+)

Patch hide | download patch | download mbox

diff --git a/criu/pstree.c b/criu/pstree.c
index 47711c56..601bf136 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -574,6 +574,15 @@  static int read_pstree_image(pid_t *pid_max)
 			ids = parent->ids;
 		}
 
+		if (!ids || !ids->has_pid_ns_id) {
+			/*
+			 * At least root_item must have ids, and pid_ns_id field
+			 * was populated since ids are introduced.
+			 */
+			pr_err("No pid_ns id\n");
+			break;
+		}
+
 		pi = lookup_create_item(e->pid);
 		if (pi == NULL)
 			break;