X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-context-vpid.c;h=3f16e03a6d996992107cbfe6eac19bb2e52dbf76;hb=5a8fd222992df9bbb709836e5bf4ca053dd776c3;hp=c99010cf80a60ba71e7a937547cabe1059f661c1;hpb=09fec6b43d11b3e0ece36f9e9e44b9627c1b565d;p=lttng-modules.git

diff --git a/lttng-context-vpid.c b/lttng-context-vpid.c
index c99010cf..3f16e03a 100644
--- a/lttng-context-vpid.c
+++ b/lttng-context-vpid.c
@@ -32,7 +32,13 @@ void vpid_record(struct lttng_ctx_field *field,
 {
 	pid_t vpid;
 
-	vpid = task_tgid_vnr(current);
+	/*
+	 * nsproxy can be NULL when scheduled out of exit.
+	 */
+	if (!current->nsproxy)
+		vpid = 0;
+	else
+		vpid = task_tgid_vnr(current);
 	lib_ring_buffer_align_ctx(ctx, ltt_alignof(vpid));
 	chan->ops->event_write(ctx, &vpid, sizeof(vpid));
 }
@@ -44,6 +50,10 @@ int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx)
 	field = lttng_append_context(ctx);
 	if (!field)
 		return -ENOMEM;
+	if (lttng_find_context(*ctx, "vpid")) {
+		lttng_remove_context_field(ctx, field);
+		return -EEXIST;
+	}
 	field->event_field.name = "vpid";
 	field->event_field.type.atype = atype_integer;
 	field->event_field.type.u.basic.integer.size = sizeof(pid_t) * CHAR_BIT;