[MERGED] openbsc[master]: abis_rsl_rx_dchan(): guard against lchan_lookup() returning ...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: abis_rsl_rx_dchan(): guard against lchan_lookup() returning NULL
......................................................................


abis_rsl_rx_dchan(): guard against lchan_lookup() returning NULL

Found this by coincidence, no actual failure case was observed.

lchan_lookup() does have a return NULL code path, so we should not blindly use
its returned pointer.

Change-Id: I34ce126d36420b8194c88c0faa865294334a6658
---
M openbsc/src/libbsc/abis_rsl.c
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index dc4ede2..316fc3f 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -1456,6 +1456,8 @@
 
 	msg->lchan = lchan_lookup(sign_link->trx, rslh->chan_nr,
 				  "Abis RSL rx DCHAN: ");
+	if (!msg->lchan)
+		return -1;
 	ts_name = gsm_lchan_name(msg->lchan);
 
 	switch (rslh->c.msg_type) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34ce126d36420b8194c88c0faa865294334a6658
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder