Skip to content

Fix head and tail link setup in list insert #89

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

Open
aidangarske wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix head and tail link setup in list insert #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
388b3c0
F-15467 - https://fenrir.wolfssl.com/finding/15467 - Clear new head e…
aidangarske Oct 21, 2026
2087847
F-15466 - https://fenrir.wolfssl.com/finding/15466 - Set new tail ent…
aidangarske Oct 21, 2026
59ed0c2
F-15467 - https://fenrir.wolfssl.com/finding/15467 - Allow the list t…
aidangarske Oct 23, 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
8 changes: 6 additions & 2 deletions src/wolfsentry_ll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ static inline void wolfsentry_list_ent_insert_before(struct wolfsentry_list_head
if (point_ent->prev) {
new_ent->prev = point_ent->prev;
new_ent->prev->next = new_ent;
} else
} else {
new_ent->prev = NULL;
list->head = new_ent;
}
point_ent->prev = new_ent;
++list->len;
}
Expand All @@ -89,8 +91,10 @@ static inline void wolfsentry_list_ent_insert_after(struct wolfsentry_list_heade
if (point_ent->next) {
new_ent->next = point_ent->next;
new_ent->next->prev = new_ent;
} else
} else {
new_ent->next = NULL;
list->tail = new_ent;
}
point_ent->next = new_ent;
++list->len;
}
Expand Down
115 changes: 115 additions & 0 deletions tests/unittests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
#define PRIVATE_DATA_ALIGNMENT 16
#endif

#ifdef __GNUC__
/* the list tests call the inline list primitives directly from run-once code */
#pragma GCC diagnostic ignored "-Winline"
#endif

#include "src/wolfsentry_internal.h"

#if (defined(_POSIX_C_SOURCE) || defined(__MACH__)) && !defined(FREERTOS)
Expand Down Expand Up @@ -1391,6 +1396,60 @@ TEST_SKIP(test_rw_locks)

#ifdef TEST_STATIC_ROUTES

static wolfsentry_errcode_t test_ll_insert_before_head_links(void) {
struct wolfsentry_list_header list;
struct wolfsentry_list_ent_header a, b, c, d;
struct wolfsentry_list_ent_header *cursor;
wolfsentry_hitcount_t n;

WOLFSENTRY_LIST_HEADER_RESET(list);
wolfsentry_list_ent_append(&list, &a);
wolfsentry_list_ent_append(&list, &b);
wolfsentry_list_ent_append(&list, &c);

/* unlink a middle entry and reinsert it before the head, as purge-list
* refresh does; the unlink leaves its old links, so the head insertion
* must clear prev.
*/
wolfsentry_list_ent_delete(&list, &b);
wolfsentry_list_ent_insert_before(&list, list.head, &b);

if (list.head != &b)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
if (list.head->prev != NULL)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
if (list.tail->next != NULL)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);

wolfsentry_list_ent_insert_before(&list, list.head, &d);
if ((list.head != &d) || (list.head->prev != NULL))
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);

n = 0;
for (cursor = list.head; cursor != NULL; cursor = cursor->next) {
++n;
if (n > list.len)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
if ((cursor->next == NULL) && (cursor != list.tail))
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
}
if (n != list.len)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);

n = 0;
for (cursor = list.tail; cursor != NULL; cursor = cursor->prev) {
++n;
if (n > list.len)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
if ((cursor->prev == NULL) && (cursor != list.head))
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
}
if (n != list.len)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);

WOLFSENTRY_RETURN_OK;
}

static wolfsentry_errcode_t replace_rule_transactionally(
WOLFSENTRY_CONTEXT_ARGS_IN,
const char *event_label,
Expand Down Expand Up @@ -1455,6 +1514,59 @@ static wolfsentry_errcode_t replace_rule_transactionally(
WOLFSENTRY_ERROR_UNLOCK_AND_RERETURN(ret);
}

static wolfsentry_errcode_t test_ll_insert_after_tail_links(void) {
struct wolfsentry_list_header list;
struct wolfsentry_list_ent_header a, b, c;
struct wolfsentry_list_ent_header sentinel;
struct wolfsentry_list_ent_header *cursor;
wolfsentry_hitcount_t n;

WOLFSENTRY_LIST_HEADER_RESET(list);
wolfsentry_list_ent_append(&list, &a);
wolfsentry_list_ent_append(&list, &b);

/* a freshly allocated entry carries an unrelated non-NULL next, which a
* correct tail insertion must overwrite with NULL.
*/
sentinel.prev = NULL;
sentinel.next = NULL;
c.prev = &sentinel;
c.next = &sentinel;

wolfsentry_list_ent_insert_after(&list, list.tail, &c);

if (list.tail != &c)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
if (list.tail->next != NULL)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
if (list.head->prev != NULL)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);

n = 0;
for (cursor = list.head; cursor != NULL; cursor = cursor->next) {
++n;
if (n > list.len)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
if ((cursor->next == NULL) && (cursor != list.tail))
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
}
if (n != list.len)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);

n = 0;
for (cursor = list.tail; cursor != NULL; cursor = cursor->prev) {
++n;
if (n > list.len)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
if ((cursor->prev == NULL) && (cursor != list.head))
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);
}
if (n != list.len)
WOLFSENTRY_ERROR_RETURN(UNIT_TEST_FAILURE);

WOLFSENTRY_RETURN_OK;
}

static int test_static_routes(void) {

struct wolfsentry_context *wolfsentry;
Expand Down Expand Up @@ -1505,6 +1617,9 @@ static int test_static_routes(void) {

WOLFSENTRY_THREAD_HEADER_CHECKED(WOLFSENTRY_THREAD_FLAG_NONE);

WOLFSENTRY_EXIT_ON_FAILURE(test_ll_insert_before_head_links());
WOLFSENTRY_EXIT_ON_FAILURE(test_ll_insert_after_tail_links());

WOLFSENTRY_EXIT_ON_FAILURE(
wolfsentry_init_ex(
wolfsentry_build_settings,
Expand Down
Loading