From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 29 Sep 2022 20:50:09 +0000 (-0400)
Subject: Fix: bytecode validator: reject specialized load instructions
X-Git-Tag: v2.12.7~2
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=68797af87e303004cf6c0298e1562ea462ad48be;hp=7496c9f18349fbbd9244339f2cf59d94321ecb9a;p=lttng-ust.git

Fix: bytecode validator: reject specialized load instructions

Reject specialized load instructions so a bytecode crafted with
nefarious intent cannot read a memory area larger than the memory
targeted by the instrumentation.

This prevents bytecode received from the session daemon from performing
out of bound memory accesses and from disclosing the content of
application memory beyond what has been targeted by the instrumentation.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Id81d73e890b29fe2ac6073681ef1faffc52ebfa7
---

diff --git a/liblttng-ust/lttng-filter-validator.c b/liblttng-ust/lttng-filter-validator.c
index acac7ce7..4e99dc50 100644
--- a/liblttng-ust/lttng-filter-validator.c
+++ b/liblttng-ust/lttng-filter-validator.c
@@ -1066,60 +1066,28 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		dbg_printf("Validate load field\n");
 		break;
 	}
+
+	/*
+	 * Disallow already specialized bytecode op load field instructions to
+	 * ensure that the received bytecode does not read a memory area larger
+	 * than the memory targeted by the instrumentation.
+	 */
 	case FILTER_OP_LOAD_FIELD_S8:
-	{
-		dbg_printf("Validate load field s8\n");
-		break;
-	}
 	case FILTER_OP_LOAD_FIELD_S16:
-	{
-		dbg_printf("Validate load field s16\n");
-		break;
-	}
 	case FILTER_OP_LOAD_FIELD_S32:
-	{
-		dbg_printf("Validate load field s32\n");
-		break;
-	}
 	case FILTER_OP_LOAD_FIELD_S64:
-	{
-		dbg_printf("Validate load field s64\n");
-		break;
-	}
 	case FILTER_OP_LOAD_FIELD_U8:
-	{
-		dbg_printf("Validate load field u8\n");
-		break;
-	}
 	case FILTER_OP_LOAD_FIELD_U16:
-	{
-		dbg_printf("Validate load field u16\n");
-		break;
-	}
 	case FILTER_OP_LOAD_FIELD_U32:
-	{
-		dbg_printf("Validate load field u32\n");
-		break;
-	}
 	case FILTER_OP_LOAD_FIELD_U64:
-	{
-		dbg_printf("Validate load field u64\n");
-		break;
-	}
 	case FILTER_OP_LOAD_FIELD_STRING:
-	{
-		dbg_printf("Validate load field string\n");
-		break;
-	}
 	case FILTER_OP_LOAD_FIELD_SEQUENCE:
-	{
-		dbg_printf("Validate load field sequence\n");
-		break;
-	}
 	case FILTER_OP_LOAD_FIELD_DOUBLE:
 	{
-		dbg_printf("Validate load field double\n");
-		break;
+		dbg_printf("Validate load field, reject specialized load instruction (%d)\n",
+				(int) opcode);
+		ret = -EINVAL;
+		goto end;
 	}
 
 	case FILTER_OP_GET_SYMBOL: