Skip to content

Commit

Permalink
sd-bus: deal with cookie overruns
Browse files Browse the repository at this point in the history
Apparently this happens IRL. Let's carefully deal with issues like this:
when we overrun, let's not go back to zero but instead leave the highest
cookie bit set. We use that as indication that we are in "overrun
territory", and then are particularly careful with checking cookies,
i.e. that they haven't been used for still outstanding replies yet. This
should retain the quick cookie generation behaviour we used to have, but
permits dealing with overruns.

Replaces: #11804
Fixes: #11809
  • Loading branch information
poettering authored and keszybz committed Feb 28, 2019
1 parent e19ebdd commit 1f82f5b
Showing 1 changed file with 46 additions and 1 deletion.
47 changes: 46 additions & 1 deletion src/libsystemd/sd-bus/sd-bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -1644,6 +1644,47 @@ _public_ int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id) {
return 0;
}

#define COOKIE_CYCLED (UINT32_C(1) << 31)

static uint64_t cookie_inc(uint64_t cookie) {

/* Stay within the 32bit range, since classic D-Bus can't deal with more */
if (cookie >= UINT32_MAX)
return COOKIE_CYCLED; /* Don't go back to zero, but use the highest bit for checking
* whether we are looping. */

return cookie + 1;
}

static int next_cookie(sd_bus *b) {
uint64_t new_cookie;

assert(b);

new_cookie = cookie_inc(b->cookie);

/* Small optimization: don't bother with checking for cookie reuse until we overran cookiespace at
* least once, but then do it thorougly. */
if (FLAGS_SET(new_cookie, COOKIE_CYCLED)) {
uint32_t i;

/* Check if the cookie is currently in use. If so, pick the next one */
for (i = 0; i < COOKIE_CYCLED; i++) {
if (!ordered_hashmap_contains(b->reply_callbacks, &new_cookie))
goto good;

new_cookie = cookie_inc(new_cookie);
}

/* Can't fulfill request */
return -EBUSY;
}

good:
b->cookie = new_cookie;
return 0;
}

static int bus_seal_message(sd_bus *b, sd_bus_message *m, usec_t timeout) {
int r;

Expand All @@ -1670,7 +1711,11 @@ static int bus_seal_message(sd_bus *b, sd_bus_message *m, usec_t timeout) {
return r;
}

return sd_bus_message_seal(m, ++b->cookie, timeout);
r = next_cookie(b);
if (r < 0)
return r;

return sd_bus_message_seal(m, b->cookie, timeout);
}

static int bus_remarshal_message(sd_bus *b, sd_bus_message **m) {
Expand Down

0 comments on commit 1f82f5b

Please sign in to comment.