From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 23 Feb 2022 22:40:06 +0000 (-0500)
Subject: Fix: lttng: truncated addresses and offsets on 32-bit builds
X-Git-Tag: v2.13.5~43
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b448ef3c46885b2e713b1fda0b53134d01bb6301;p=lttng-tools.git

Fix: lttng: truncated addresses and offsets on 32-bit builds

The lttng client parses hexadecimal addresses using, at some point,
strtoul(). Using this function effectively caps addresses and
offsets to MAX_UINT32 resulting in failures to enable kprobes
against a 64-bit kernel using a 32-bit client.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: If619e9e84413de5cd32d8c06f363152caaf5ac46
---

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index 4395c182b..c1926b4d6 100644
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -355,7 +355,7 @@ static int parse_kernel_probe_opts(const char *source,
 			PERROR("Failed to copy kernel probe location symbol name.");
 			goto error;
 		}
-		offset = strtoul(s_hex, NULL, 0);
+		offset = strtoull(s_hex, NULL, 0);
 
 		*location = lttng_kernel_probe_location_symbol_create(
 				symbol_name, offset);
@@ -401,7 +401,7 @@ static int parse_kernel_probe_opts(const char *source,
 			goto error;
 		}
 
-		address = strtoul(s_hex, NULL, 0);
+		address = strtoull(s_hex, NULL, 0);
 		*location = lttng_kernel_probe_location_address_create(address);
 		if (!*location) {
 			ERR("Failed to create symbol kernel probe location.");
diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 388c5ac36..30d28cb26 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -130,7 +130,7 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt)
 			ret = CMD_ERROR;
 			goto end;
 		}
-		ev->attr.probe.offset = strtoul(s_hex, NULL, 0);
+		ev->attr.probe.offset = strtoull(s_hex, NULL, 0);
 		DBG("probe offset %" PRIu64, ev->attr.probe.offset);
 		ev->attr.probe.addr = 0;
 		goto end;
@@ -164,7 +164,7 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt)
 			ret = CMD_ERROR;
 			goto end;
 		}
-		ev->attr.probe.addr = strtoul(s_hex, NULL, 0);
+		ev->attr.probe.addr = strtoull(s_hex, NULL, 0);
 		DBG("probe addr %" PRIu64, ev->attr.probe.addr);
 		ev->attr.probe.offset = 0;
 		memset(ev->attr.probe.symbol_name, 0, LTTNG_SYMBOL_NAME_LEN);