Skip to content

Fix wifi.Monitor crash when it is made again after deinit #11651

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
dhalbert merged 1 commit into from
Oct 22, 2026
Merged

Fix wifi.Monitor crash when it is made again after deinit #11651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 16 additions & 12 deletions ports/espressif/common-hal/wifi/Monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ static const char *TAG = "monitor";
static void wifi_monitor_cb(void *recv_buf, wifi_promiscuous_pkt_type_t type) {
wifi_promiscuous_pkt_t *pkt = (wifi_promiscuous_pkt_t *)recv_buf;

// Construct enables promiscuous mode before make_new sets the singleton.
wifi_monitor_obj_t *self = MP_STATE_VM(wifi_monitor_singleton);
if (self == NULL || common_hal_wifi_monitor_deinited(self)) {
return;
}

// prepare packet
monitor_packet_t packet = {
.channel = pkt->rx_ctrl.channel,
Expand All @@ -43,14 +49,11 @@ static void wifi_monitor_cb(void *recv_buf, wifi_promiscuous_pkt_type_t type) {
packet.payload = malloc(packet.length);
if (packet.payload) {
memcpy(packet.payload, pkt->payload, packet.length);
wifi_monitor_obj_t *self = MP_STATE_VM(wifi_monitor_singleton);
if (self->queue) {
// send packet
if (xQueueSendFromISR(self->queue, &packet, NULL) != pdTRUE) {
self->lost++;
free(packet.payload);
ESP_LOGE(TAG, "packet queue full");
}
// send packet
if (xQueueSendFromISR(self->queue, &packet, NULL) != pdTRUE) {
self->lost++;
free(packet.payload);
ESP_LOGE(TAG, "packet queue full");
}
} else {
ESP_LOGE(TAG, "not enough memory for packet");
Expand Down Expand Up @@ -97,13 +100,12 @@ void common_hal_wifi_monitor_construct(wifi_monitor_obj_t *self, uint8_t channel
self->queue_length = queue;
}

bool common_hal_wifi_monitor_deinited(void) {
bool enabled;
return (esp_wifi_get_promiscuous(&enabled) == ESP_ERR_WIFI_NOT_INIT) ? true : !enabled;
bool common_hal_wifi_monitor_deinited(wifi_monitor_obj_t *self) {
return self->queue == NULL;
}

void common_hal_wifi_monitor_deinit(wifi_monitor_obj_t *self) {
if (common_hal_wifi_monitor_deinited()) {
if (common_hal_wifi_monitor_deinited(self)) {
return;
}

Expand All @@ -119,6 +121,8 @@ void common_hal_wifi_monitor_deinit(wifi_monitor_obj_t *self) {
}
vQueueDelete(self->queue);
self->queue = NULL;
// Root pointers outlive the VM heap.
MP_STATE_VM(wifi_monitor_singleton) = NULL;
}

void common_hal_wifi_monitor_set_channel(wifi_monitor_obj_t *self, uint8_t channel) {
Expand Down
4 changes: 3 additions & 1 deletion ports/espressif/common-hal/wifi/__init__.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,9 @@ void wifi_reset(void) {
if (!wifi_inited) {
return;
}
common_hal_wifi_monitor_deinit(MP_STATE_VM(wifi_monitor_singleton));
if (MP_STATE_VM(wifi_monitor_singleton) != NULL) {
common_hal_wifi_monitor_deinit(MP_STATE_VM(wifi_monitor_singleton));
}
wifi_radio_obj_t *radio = &common_hal_wifi_radio_obj;
common_hal_wifi_radio_set_enabled(radio, false);
#ifndef CONFIG_IDF_TARGET_ESP32
Expand Down
2 changes: 1 addition & 1 deletion ports/raspberrypi/common-hal/wifi/Monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void common_hal_wifi_monitor_construct(wifi_monitor_obj_t *self, uint8_t channel
mp_raise_NotImplementedError(MP_ERROR_TEXT("wifi.Monitor not available"));
}

bool common_hal_wifi_monitor_deinited(void) {
bool common_hal_wifi_monitor_deinited(wifi_monitor_obj_t *self) {
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions ports/zephyr-cp/common-hal/wifi/Monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ void common_hal_wifi_monitor_construct(wifi_monitor_obj_t *self, uint8_t channel
// self->queue_length = queue;
}

bool common_hal_wifi_monitor_deinited(void) {
bool common_hal_wifi_monitor_deinited(wifi_monitor_obj_t *self) {
// bool enabled;
// return (esp_wifi_get_promiscuous(&enabled) == ESP_ERR_WIFI_NOT_INIT) ? true : !enabled;
return true;
}

void common_hal_wifi_monitor_deinit(wifi_monitor_obj_t *self) {
if (common_hal_wifi_monitor_deinited()) {
if (common_hal_wifi_monitor_deinited(self)) {
return;
}

Comment thread
mikeysklar marked this conversation as resolved.
Resolved
Expand Down
6 changes: 3 additions & 3 deletions shared-bindings/wifi/Monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static mp_obj_t wifi_monitor_make_new(const mp_obj_type_t *type, size_t n_args,
mp_int_t queue = mp_arg_validate_int_min(args[ARG_queue].u_int, 0, MP_QSTR_queue);

wifi_monitor_obj_t *self = MP_STATE_VM(wifi_monitor_singleton);
if (common_hal_wifi_monitor_deinited()) {
if (self == NULL || common_hal_wifi_monitor_deinited(self)) {
self = mp_obj_malloc_with_finaliser(wifi_monitor_obj_t, &wifi_monitor_type);
common_hal_wifi_monitor_construct(self, channel, queue);
MP_STATE_VM(wifi_monitor_singleton) = self;
Expand Down Expand Up @@ -109,7 +109,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_lost_obj, wifi_monitor_obj_get_lost);
//| ...
//|
static mp_obj_t wifi_monitor_obj_get_queued(mp_obj_t self_in) {
if (common_hal_wifi_monitor_deinited()) {
if (common_hal_wifi_monitor_deinited(self_in)) {
return mp_obj_new_int_from_uint(0);
}
return common_hal_wifi_monitor_get_queued(self_in);
Expand All @@ -122,7 +122,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_queued_obj, wifi_monitor_obj_get_queued);
//|
//|
static mp_obj_t wifi_monitor_obj_get_packet(mp_obj_t self_in) {
if (common_hal_wifi_monitor_deinited()) {
if (common_hal_wifi_monitor_deinited(self_in)) {
raise_deinited_error();
}
return common_hal_wifi_monitor_get_packet(self_in);
Expand Down
2 changes: 1 addition & 1 deletion shared-bindings/wifi/Monitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern const mp_obj_type_t wifi_monitor_type;
void common_hal_wifi_monitor_construct(wifi_monitor_obj_t *self,
uint8_t channel, size_t queue);
void common_hal_wifi_monitor_deinit(wifi_monitor_obj_t *self);
bool common_hal_wifi_monitor_deinited(void);
bool common_hal_wifi_monitor_deinited(wifi_monitor_obj_t *self);

void common_hal_wifi_monitor_set_channel(wifi_monitor_obj_t *self, uint8_t channel);
mp_obj_t common_hal_wifi_monitor_get_channel(wifi_monitor_obj_t *self);
Expand Down
Loading