[MERGED] osmo-bts[master]: RSL IPA DLCX: Avoid another null-pointer dereference

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Sun Feb 25 12:06:24 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: RSL IPA DLCX: Avoid another null-pointer dereference
......................................................................


RSL IPA DLCX: Avoid another null-pointer dereference

In case a DLCX _with conn-id_ is issued without any CRCX before,
we ran into a NULL pointer dereference in adding the connection
statistics.  Let's handle this gracefully and simply return empty
statistics.

Change-Id: If8b71266c847b90cdc51695b9f47b527c51bd70c
Closes: OS#2996
---
M src/common/rsl.c
1 file changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/src/common/rsl.c b/src/common/rsl.c
index 2f6e295..5c266ba 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1482,14 +1482,13 @@
 
 	struct ipa_stats stats;
 
-
 	memset(&stats, 0, sizeof(stats));
 
-
-	osmo_rtp_socket_stats(lchan->abis_ip.rtp_socket,
-				&stats.packets_sent, &stats.octets_sent,
-				&stats.packets_recv, &stats.octets_recv,
-				&stats.packets_lost, &stats.arrival_jitter);
+	if (lchan->abis_ip.rtp_socket)
+		osmo_rtp_socket_stats(lchan->abis_ip.rtp_socket,
+					&stats.packets_sent, &stats.octets_sent,
+					&stats.packets_recv, &stats.octets_recv,
+					&stats.packets_lost, &stats.arrival_jitter);
 	/* convert to network byte order */
 	stats.packets_sent = htonl(stats.packets_sent);
 	stats.octets_sent = htonl(stats.octets_sent);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8b71266c847b90cdc51695b9f47b527c51bd70c
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list