laforge submitted this change.

View Change

Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified
main: fix crash when ccid_df_write_in() fails

The OSMO_ASSERT(msg->list.next != LLIST_POISON1) are checking msgb
which has been removed from the llist.
All llist members which aren't part of a list have LLIST_POISON1 assigned.

These OSMO_ASSERT()s will always trigger this msgb.

Fixes: a684bc4e38b4 ("Make ch9 usb tests work")
Change-Id: I49c81fba756f3620638b6c6c664f53e4a8758ef9
---
M sysmoOCTSIM/main.c
1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c
index 74de4bf..ce4d4e6 100644
--- a/sysmoOCTSIM/main.c
+++ b/sysmoOCTSIM/main.c
@@ -172,10 +172,6 @@
ep_q->in_progress = msg;
rc = ccid_df_write_in(msgb_data(msg), msgb_length(msg));
if (rc != ERR_NONE) {
- OSMO_ASSERT(msg->list.next != LLIST_POISON1)
- OSMO_ASSERT(msg->list.next->next != LLIST_POISON1)
- OSMO_ASSERT(msg->list.prev != LLIST_POISON2)
- OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2)
printf("EP %s failed: %d\r\n", ep_q->name, rc);
return -1;
}

To view, visit change 42161. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I49c81fba756f3620638b6c6c664f53e4a8758ef9
Gerrit-Change-Number: 42161
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus <lynxis@fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>