|
|
c2dfb7 |
From 1d8e642b0b67f07b0bf469c25126b878380bae6a Mon Sep 17 00:00:00 2001
|
|
|
c2dfb7 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
c2dfb7 |
Date: Thu, 17 Jan 2019 18:13:03 +0100
|
|
|
c2dfb7 |
Subject: [PATCH] sd-bus: make rqueue/wqueue sizes of type size_t
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
Let's do this like we usually do and size arrays with size_t.
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
We already do this for the "allocated" counter correctly, and externally
|
|
|
c2dfb7 |
we expose the queue sizes as uint64_t anyway, hence there's really no
|
|
|
c2dfb7 |
point in usigned "unsigned" internally.
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
(cherry picked from commit 143d4e045a798ccc87889b2a8a60d7fbe44be441)
|
|
|
c2dfb7 |
Related: CVE-2020-1712
|
|
|
c2dfb7 |
---
|
|
|
c2dfb7 |
src/libsystemd/sd-bus/bus-internal.h | 4 ++--
|
|
|
c2dfb7 |
src/libsystemd/sd-bus/sd-bus.c | 2 +-
|
|
|
c2dfb7 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
|
|
|
c2dfb7 |
index 5d773b14c4..06bd7862cb 100644
|
|
|
c2dfb7 |
--- a/src/libsystemd/sd-bus/bus-internal.h
|
|
|
c2dfb7 |
+++ b/src/libsystemd/sd-bus/bus-internal.h
|
|
|
c2dfb7 |
@@ -221,11 +221,11 @@ struct sd_bus {
|
|
|
c2dfb7 |
size_t rbuffer_size;
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
sd_bus_message **rqueue;
|
|
|
c2dfb7 |
- unsigned rqueue_size;
|
|
|
c2dfb7 |
+ size_t rqueue_size;
|
|
|
c2dfb7 |
size_t rqueue_allocated;
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
sd_bus_message **wqueue;
|
|
|
c2dfb7 |
- unsigned wqueue_size;
|
|
|
c2dfb7 |
+ size_t wqueue_size;
|
|
|
c2dfb7 |
size_t windex;
|
|
|
c2dfb7 |
size_t wqueue_allocated;
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
|
|
|
c2dfb7 |
index 1c9e967ae0..64026f7ee1 100644
|
|
|
c2dfb7 |
--- a/src/libsystemd/sd-bus/sd-bus.c
|
|
|
c2dfb7 |
+++ b/src/libsystemd/sd-bus/sd-bus.c
|
|
|
c2dfb7 |
@@ -2080,7 +2080,7 @@ _public_ int sd_bus_call(
|
|
|
c2dfb7 |
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = sd_bus_message_ref(_m);
|
|
|
c2dfb7 |
usec_t timeout;
|
|
|
c2dfb7 |
uint64_t cookie;
|
|
|
c2dfb7 |
- unsigned i;
|
|
|
c2dfb7 |
+ size_t i;
|
|
|
c2dfb7 |
int r;
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
bus_assert_return(m, -EINVAL, error);
|