Skip to content

memfault: fix PC and LR for secure faults #659

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
merged 5 commits into from
Aug 21, 2025
Merged

memfault: fix PC and LR for secure faults #659

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
ce8767f
memfault: fix PC and LR for secure faults
JordanYates Aug 21, 2025
3fc0a1b
nrf_modem_lib: fix buffer size
JordanYates Aug 21, 2025
487004c
nrf_modem_lib: ensure KV value NULL terminated
JordanYates Aug 21, 2025
840e067
rpc: commands: lte_at_cmd: ensure NULL termination
JordanYates Aug 21, 2025
833bf22
gnss: ubx_modem: one identifier per line
JordanYates Aug 21, 2025
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
7 changes: 5 additions & 2 deletions drivers/gnss/gnss_ubx_modem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,9 @@ void ubx_modem_init(struct ubx_modem_data *modem, struct modem_pipe *pipe)

void ubx_modem_software_standby(struct ubx_modem_data *modem)
{
struct ubx_message_handler_ctx *curr, *tmp, *prev = NULL;
struct ubx_message_handler_ctx *prev = NULL;
struct ubx_message_handler_ctx *curr;
struct ubx_message_handler_ctx *tmp;

/** Purge any callbacks expecting a response */
k_sem_take(&modem->handlers_sem, K_FOREVER);
Expand Down Expand Up @@ -334,7 +336,8 @@ int ubx_modem_send_sync(struct ubx_modem_data *modem, struct net_buf_simple *buf
struct k_poll_event events[] = {
K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_SIGNAL, K_POLL_MODE_NOTIFY_ONLY, &sig),
};
int signaled, rc;
int signaled;
int rc;

k_poll_signal_init(&sig);

Expand Down
7 changes: 7 additions & 0 deletions lib/memfault/infuse_memfault.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,13 @@ void memfault_reboot_tracking_load(sMemfaultRebootTrackingStorage *dst)
.pc = infuse_reboot.info.exception_basic.program_counter,
.lr = infuse_reboot.info.exception_basic.link_register,
};
#ifdef CONFIG_ARM
if (infuse_reboot.info_type == INFUSE_REBOOT_INFO_EXCEPTION_ESF) {
/* Stack frame instead of basic ESF */
reboot_info->pc = infuse_reboot.info.exception_full.basic.pc;
reboot_info->lr = infuse_reboot.info.exception_full.basic.lr;
}
#endif /* CONFIG_ARM */

/* Defer logging of the secure fault trace event until after Memfault has finished
* initialising. Use a delayable worked since an immediate `k_work_submit` will just
Expand Down
5 changes: 3 additions & 2 deletions lib/nrf_modem_lib/nrf_modem_monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ static void network_info_update(struct k_work *work)
}

if (!sim_card_queried) {
KV_STRUCT_KV_STRING_VAR(24) sim_uicc;
KV_STRUCT_KV_STRING_VAR(25) sim_uicc;

rc = nrf_modem_at_scanf("AT%XICCID", "%%XICCID: %24s", sim_uicc.value);
if (rc == 1) {
Expand Down Expand Up @@ -366,7 +366,7 @@ static void lte_kv_value_changed(uint16_t key, const void *data, size_t data_len

static void infuse_modem_init(int ret, void *ctx)
{
KV_STRUCT_KV_STRING_VAR(64) modem_info = {0};
KV_STRUCT_KV_STRING_VAR(65) modem_info = {0};
KV_KEY_TYPE(KV_KEY_LTE_MODEM_IMEI) modem_imei;
static bool modem_info_stored;
uint8_t val;
Expand Down Expand Up @@ -418,6 +418,7 @@ static void infuse_modem_init(int ret, void *ctx)
#else
/* Read the configured value */
rc = kv_store_read(KV_KEY_LTE_PDP_CONFIG, &pdp_config, sizeof(pdp_config));
pdp_config.apn.value[sizeof(pdp_config.apn.value) - 1] = '\0';
#endif /* CONFIG_INFUSE_NRF_MODEM_MONITOR_DEFAULT_PDP_APN_SET */

/* If a PDP configuration has been set */
Expand Down
5 changes: 4 additions & 1 deletion subsys/rpc/commands/lte_at_cmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ struct net_buf *rpc_command_lte_at_cmd(struct net_buf *request)
struct rpc_lte_at_cmd_request *req = (void *)request->data;
struct rpc_lte_at_cmd_response rsp = {0};
struct net_buf *rsp_buf;
size_t tailroom;
uint8_t *tail;
int rc;

Expand All @@ -39,8 +40,10 @@ struct net_buf *rpc_command_lte_at_cmd(struct net_buf *request)
rsp_buf = rpc_response_simple_req(request, 0, &rsp, sizeof(rsp));

tail = net_buf_tail(rsp_buf);
rc = nrf_modem_at_cmd(tail, net_buf_tailroom(rsp_buf), "%s", req->cmd);
tailroom = net_buf_tailroom(rsp_buf);
rc = nrf_modem_at_cmd(tail, tailroom, "%s", req->cmd);
if (rc >= 0) {
tail[tailroom - 1] = 0x00;
net_buf_add(rsp_buf, strlen(tail));
} else {
/* Update return code */
Expand Down
Loading