Change in osmo-bsc[master]: rsl_data_request() check lchan pointer before access

neels gerrit-no-reply at lists.osmocom.org
Sun Jun 13 16:21:28 UTC 2021


neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24652 )


Change subject: rsl_data_request() check lchan pointer before access
......................................................................

rsl_data_request() check lchan pointer before access

fixup for commit 43aeeaf05ad814ccab0e93227b1248a20302c8ec
'RSL chan_nr: replace OSMO_ASSERT with error handling'
I71ed6437c403a3f9336e17a94b4948fca295d853

Related: CID#236319
Related: SYS#5315 OS#4940
Change-Id: I873c1a27f9449a56c525984ea50bfcf6daa4b5f8
---
M src/osmo-bsc/abis_rsl.c
1 file changed, 7 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/24652/1

diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c
index ac8006d..7525e31 100644
--- a/src/osmo-bsc/abis_rsl.c
+++ b/src/osmo-bsc/abis_rsl.c
@@ -939,11 +939,7 @@
 /* Chapter 8.3.1 */
 int rsl_data_request(struct msgb *msg, uint8_t link_id)
 {
-	int chan_nr = gsm_lchan2chan_nr(msg->lchan, true);
-	if (chan_nr < 0) {
-		msgb_free(msg);
-		return chan_nr;
-	}
+	int chan_nr;
 
 	if (msg->lchan == NULL) {
 		LOGP(DRSL, LOGL_ERROR, "cannot send DATA REQUEST to unknown lchan\n");
@@ -951,6 +947,12 @@
 		return -EINVAL;
 	}
 
+	chan_nr = gsm_lchan2chan_nr(msg->lchan, true);
+	if (chan_nr < 0) {
+		msgb_free(msg);
+		return chan_nr;
+	}
+
 	rsl_rll_push_l3(msg, RSL_MT_DATA_REQ, chan_nr, link_id, 1);
 
 	msg->dst = rsl_chan_link(msg->lchan);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24652
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I873c1a27f9449a56c525984ea50bfcf6daa4b5f8
Gerrit-Change-Number: 24652
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210613/702cd23c/attachment.htm>


More information about the gerrit-log mailing list