From afd5b8247fcd1d9c9ebded62e4833cc2ca04463d Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Sun, 17 Nov 2019 17:39:20 +0700 Subject: mobile/gsm48_rr.c: fix NULL-pointer dereference in gsm48_rr_check_mode() In some cases (e.g. at start up) ms->rrlayer may not be initialized. Let's access ms->settings directly since we already have a pointer to struct osmocom_ms. Change-Id: Ia9720132fcda960dcecefab9ae48398946503dc4 --- src/host/layer23/src/mobile/gsm48_rr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 254183e3..b3da258b 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -319,7 +319,7 @@ static uint8_t gsm48_rr_check_mode(struct osmocom_ms *ms, uint8_t chan_nr, int gsm48_rr_alter_delay(struct osmocom_ms *ms) { struct gsm48_rrlayer *rr = &ms->rrlayer; - struct gsm_settings *set = &rr->ms->settings; + struct gsm_settings *set = &ms->settings; if (rr->state != GSM48_RR_ST_DEDICATED) return -EINVAL; -- cgit v1.2.3