74 lines
2.5 KiB
Diff
74 lines
2.5 KiB
Diff
From d80cc39558ec7e596d594d1aadc4df81262611f8 Mon Sep 17 00:00:00 2001
|
|
From: Luca Boccassi <bluca@debian.org>
|
|
Date: Sun, 16 Jul 2023 01:10:47 +0100
|
|
Subject: [PATCH] bus: add some minimal bounds check on signatures
|
|
|
|
CID#1491292
|
|
CID#1491291
|
|
CID#1491290
|
|
CID#1491289
|
|
CID#1491284
|
|
CID#1491281
|
|
CID#1491280
|
|
CID#1491278
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/systemd/systemd-stable/commit/d80cc39558ec7e596d594d1aadc4df81262611f8
|
|
|
|
---
|
|
src/busctl/busctl.c | 5 ++++-
|
|
src/libsystemd/sd-bus/bus-message.c | 6 ++++++
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
|
|
index 72eed36335..c1a0479015 100644
|
|
--- a/src/busctl/busctl.c
|
|
+++ b/src/busctl/busctl.c
|
|
@@ -1627,8 +1627,11 @@ static int message_append_cmdline(sd_bus_message *m, const char *signature, char
|
|
p--;
|
|
|
|
r = signature_element_length(signature, &k);
|
|
- if (r < 0)
|
|
+ if (r < 0 || k < 2) {
|
|
+ if (r >= 0 && k < 2)
|
|
+ r = -ERANGE;
|
|
return log_error_errno(r, "Invalid struct/dict entry signature: %m");
|
|
+ }
|
|
|
|
{
|
|
char s[k-1];
|
|
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
|
|
index 3cf1419a14..f1cf6a8cc4 100644
|
|
--- a/src/libsystemd/sd-bus/bus-message.c
|
|
+++ b/src/libsystemd/sd-bus/bus-message.c
|
|
@@ -2027,6 +2027,8 @@ _public_ int sd_bus_message_appendv(
|
|
r = signature_element_length(t, &k);
|
|
if (r < 0)
|
|
return r;
|
|
+ if (k < 2)
|
|
+ return -ERANGE;
|
|
|
|
{
|
|
char s[k - 1];
|
|
@@ -3470,6 +3472,8 @@ _public_ int sd_bus_message_readv(
|
|
r = signature_element_length(t, &k);
|
|
if (r < 0)
|
|
return r;
|
|
+ if (k < 2)
|
|
+ return -ERANGE;
|
|
|
|
{
|
|
char s[k - 1];
|
|
@@ -3650,6 +3654,8 @@ _public_ int sd_bus_message_skip(sd_bus_message *m, const char *types) {
|
|
r = signature_element_length(types, &k);
|
|
if (r < 0)
|
|
return r;
|
|
+ if (k < 2)
|
|
+ return -ERANGE;
|
|
|
|
{
|
|
char s[k-1];
|
|
--
|
|
2.39.1
|
|
|