Skip to content

Fix Inverted Bit-Index and Shared Lock Leak on Event Lookup Failure #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
douzzer merged 5 commits into from
Apr 16, 2026
Merged

Fix Inverted Bit-Index and Shared Lock Leak on Event Lookup Failure #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28d054e
F-2454 - https://fenrir.wolfssl.com/finding/2454 - Fix inverted bit-i…
aidangarske Apr 8, 2026
f9e1ee5
F-2062 - https://fenrir.wolfssl.com/finding/2062 - Fix shared lock le…
aidangarske Apr 8, 2026
527e588
Address fenrir review x copilot review
aidangarske Apr 9, 2026
41c930d
\- HIGH-1 fix: Applied same bit-index correction to wolfsentry_route_…
aidangarske Apr 9, 2026
ed1fba0
Address peer review
aidangarske Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/routes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ static inline int cmp_addrs_prefixful(
if ((cmp = memcmp(left_addr, right_addr, min_bytes - 1)))
return cmp;
}
if ((left_addr[min_bytes - 1] >> (min_addr_len & 0x7)) ==
(right_addr[min_bytes - 1] >> (min_addr_len & 0x7)))
if ((left_addr[min_bytes - 1] >> (8 - (min_addr_len & 0x7))) ==
(right_addr[min_bytes - 1] >> (8 - (min_addr_len & 0x7))))
*inexact_p = 1;
else if (left_addr[min_bytes - 1] < right_addr[min_bytes - 1])
return -1;
Expand Down Expand Up @@ -738,8 +738,8 @@ static wolfsentry_errcode_t wolfsentry_route_init(
int left_over_bits = remote->addr_len % BITS_PER_BYTE;
if (left_over_bits) {
byte *remote_lsb = WOLFSENTRY_ROUTE_REMOTE_ADDR(new) + WOLFSENTRY_BITS_TO_BYTES(remote->addr_len) - 1;
if (*remote_lsb & (0xffU >> (BITS_PER_BYTE - left_over_bits)))
*remote_lsb = (byte)(*remote_lsb & (0xffU << left_over_bits));
if (*remote_lsb & (0xffU >> left_over_bits))
*remote_lsb = (byte)(*remote_lsb & (0xffU << (BITS_PER_BYTE - left_over_bits)));
}
}
#ifdef WOLFSENTRY_ADDR_BITMASK_MATCHING
Expand All @@ -754,8 +754,8 @@ static wolfsentry_errcode_t wolfsentry_route_init(
int left_over_bits = local->addr_len % BITS_PER_BYTE;
if (left_over_bits) {
byte *local_lsb = WOLFSENTRY_ROUTE_LOCAL_ADDR(new) + WOLFSENTRY_BITS_TO_BYTES(local->addr_len) - 1;
if (*local_lsb & (0xffU >> (BITS_PER_BYTE - left_over_bits)))
*local_lsb = (byte)(*local_lsb & (0xffU << left_over_bits));
if (*local_lsb & (0xffU >> left_over_bits))
*local_lsb = (byte)(*local_lsb & (0xffU << (BITS_PER_BYTE - left_over_bits)));
}
}

Expand Down Expand Up @@ -900,8 +900,8 @@ static wolfsentry_errcode_t wolfsentry_route_init_by_exports(
int left_over_bits = route_exports->remote.addr_len % BITS_PER_BYTE;
if (left_over_bits) {
byte *remote_lsb = WOLFSENTRY_ROUTE_REMOTE_ADDR(new) + WOLFSENTRY_BITS_TO_BYTES(route_exports->remote.addr_len) - 1;
if (*remote_lsb & (0xffU >> (BITS_PER_BYTE - left_over_bits)))
*remote_lsb = (byte)(*remote_lsb & (0xffU << left_over_bits));
if (*remote_lsb & (0xffU >> left_over_bits))
*remote_lsb = (byte)(*remote_lsb & (0xffU << (BITS_PER_BYTE - left_over_bits)));
}
}

Expand All @@ -917,8 +917,8 @@ static wolfsentry_errcode_t wolfsentry_route_init_by_exports(
int left_over_bits = route_exports->local.addr_len % BITS_PER_BYTE;
if (left_over_bits) {
byte *local_lsb = WOLFSENTRY_ROUTE_LOCAL_ADDR(new) + WOLFSENTRY_BITS_TO_BYTES(route_exports->local.addr_len) - 1;
if (*local_lsb & (0xffU >> (BITS_PER_BYTE - left_over_bits)))
*local_lsb = (byte)(*local_lsb & (0xffU << left_over_bits));
if (*local_lsb & (0xffU >> left_over_bits))
*local_lsb = (byte)(*local_lsb & (0xffU << (BITS_PER_BYTE - left_over_bits)));
}
}

Expand Down Expand Up @@ -2890,7 +2890,7 @@ static wolfsentry_errcode_t wolfsentry_route_event_dispatch_by_id_1(

if (event_label) {
if ((ret = wolfsentry_event_get_reference(WOLFSENTRY_CONTEXT_ARGS_OUT, event_label, event_label_len, &trigger_event)) < 0)
WOLFSENTRY_ERROR_RERETURN(ret);
goto out;
Comment thread
aidangarske marked this conversation as resolved.
}

if ((ret = wolfsentry_table_ent_get_by_id(WOLFSENTRY_CONTEXT_ARGS_OUT, id, (struct wolfsentry_table_ent_header **)&route)) < 0)
Expand Down Expand Up @@ -2958,7 +2958,7 @@ static wolfsentry_errcode_t wolfsentry_route_event_dispatch_by_route_1(

if (event_label) {
if ((ret = wolfsentry_event_get_reference(WOLFSENTRY_CONTEXT_ARGS_OUT, event_label, event_label_len, &trigger_event)) < 0)
WOLFSENTRY_ERROR_RERETURN(ret);
goto out;
}

if (route->header.parent_table->ent_type != WOLFSENTRY_OBJECT_TYPE_ROUTE) {
Expand Down
Loading
Loading