Review at  https://gerrit.osmocom.org/6754

host/trxcon/scheduler: fix possible NULL deference

We should make sure that required timeslot is not only allocated,
but also configured, i.e. has a correct multiframe layout.

Change-Id: I1d0b870c389802b51c709d089b80ac3fb3565fa8
---
M src/host/trxcon/sched_trx.c
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/54/6754/1

diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c
index 3e61582..cf05bb6 100644
--- a/src/host/trxcon/sched_trx.c
+++ b/src/host/trxcon/sched_trx.c
@@ -423,9 +423,9 @@
        uint32_t fn, elapsed;
        uint8_t offset, bid;
 
-       /* Check whether required timeslot is enabled / configured */
+       /* Check whether required timeslot is allocated and configured */
        ts = sched_trx_find_ts(trx, tn);
-       if (ts == NULL) {
+       if (ts == NULL || ts->mf_layout == NULL) {
                LOGP(DSCH, LOGL_DEBUG, "TDMA timeslot #%u isn't configured, "
                        "ignoring burst...\n", tn);
                return -EINVAL;

-- 
To view, visit https://gerrit.osmocom.org/6754
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d0b870c389802b51c709d089b80ac3fb3565fa8
Gerrit-PatchSet: 1
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>

Reply via email to