laforge submitted this change.

View Change


Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified
llc: fix l3par check in gprs_llc_lle_generate_xid()

A NULL pointer dereference is possible if this function is called
with l3par being NULL, but l3par_len being greater than 0.

Change-Id: I80c18a45a248b85901d455bfb17e81734fa5961d
Fixes: CID#300602
---
M src/llc/llc.c
1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/llc/llc.c b/src/llc/llc.c
index 48d1ba6..f8c6ba1 100644
--- a/src/llc/llc.c
+++ b/src/llc/llc.c
@@ -475,7 +475,7 @@
xid_fields[2].type = OSMO_GPRS_LLC_XID_T_N201_I;
xid_fields[2].val = lle->params.n201_i;

- if (l3par_len > 0) {
+ if (l3par != NULL && l3par_len > 0) {
xid_fields[3].type = OSMO_GPRS_LLC_XID_T_L3_PAR;
xid_fields[3].var.val_len = l3par_len;
if (l3par_len > 0) {

To view, visit change 35300. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I80c18a45a248b85901d455bfb17e81734fa5961d
Gerrit-Change-Number: 35300
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-MessageType: merged