fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30613 )
Change subject: layer23: fix rx_l1_sim_conf(): msg->l2h is NULL, use msg->l1h
......................................................................
layer23: fix rx_l1_sim_conf(): msg->l2h is NULL, use msg->l1h
The mobile app crashes when using a Calypso phone and specifically
when using its built-in SIM reader. The problem is that msg->l2h
is NULL in rx_l1_sim_conf(), so msg->l1h must be used instead.
Assert failed msgb->l2h /usr/local/include/osmocom/core/msgb.h:162
Change-Id: I7c68a3ad393be5fd0413e00e119a06db59672357
---
M src/host/layer23/src/common/l1ctl.c
1 file changed, 1 insertion(+), 4 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/host/layer23/src/common/l1ctl.c
b/src/host/layer23/src/common/l1ctl.c
index 7482788..94079c7 100644
--- a/src/host/layer23/src/common/l1ctl.c
+++ b/src/host/layer23/src/common/l1ctl.c
@@ -736,10 +736,7 @@
/* just forward the SIM response to the SIM handler */
static int rx_l1_sim_conf(struct osmocom_ms *ms, struct msgb *msg)
{
- uint16_t len = msgb_l2len(msg);
- uint8_t *data = msg->data;
-
- LOGP(DL1C, LOGL_INFO, "SIM %s\n", osmo_hexdump(data, len));
+ LOGP(DL1C, LOGL_INFO, "SIM %s\n", msgb_hexdump_l1(msg));
sim_apdu_resp(ms, msg);
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30613
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I7c68a3ad393be5fd0413e00e119a06db59672357
Gerrit-Change-Number: 30613
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
