RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge #19611 #19640

Browse Source 
19611: sys/net/rpl: fix possible NULL dereference r=benpicco a=maribu

### Contribution description

As the title says


19640: core/thread: drop unused thread_arch_t r=benpicco a=maribu

### Contribution description

No architecture makes use of thread_arch_t anymore, so let's drop it.


Co-authored-by: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
This commit is contained in:
bors[bot] 2023-05-22 14:10:24 +00:00 committed by GitHub
commit dc0fe5283f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/include/thread.h
View File

@ -122,7 +122,6 @@
#include "clist.h"
#include "cib.h"
#include "msg.h"
#include "cpu_conf.h"
#include "sched.h"
#include "thread_config.h"
@ -207,9 +206,6 @@ struct _thread {
#ifdef PICOLIBC_TLS
void *tls; /**< thread local storage ptr */
#endif
#ifdef HAVE_THREAD_ARCH_T
thread_arch_t arch; /**< architecture dependent part */
#endif
};
/**

2
cpu/cortexm_common/include/thread_arch.h
View File

@ -20,6 +20,8 @@
#ifndef THREAD_ARCH_H
#define THREAD_ARCH_H
#include "cpu_conf.h"
#ifdef __cplusplus
extern "C" {
#endif

2
sys/net/gnrc/routing/rpl/gnrc_rpl_control_messages.c
View File

@ -1231,7 +1231,7 @@ void gnrc_rpl_recv_DAO_ACK(gnrc_rpl_dao_ack_t *dao_ack, kernel_pid_t iface, ipv6
#endif
if (!IS_ACTIVE(CONFIG_GNRC_RPL_WITHOUT_VALIDATION)) {
if (!gnrc_rpl_validation_DAO_ACK(dao_ack, len, dst)) {
if (!dst || !gnrc_rpl_validation_DAO_ACK(dao_ack, len, dst)) {
return;
}
}