Change in libosmocore[master]: cbsp: Fix encoding of "ETWS Warning Security Info" IE

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21917 )

Change subject: cbsp: Fix encoding of "ETWS Warning Security Info" IE
......................................................................

cbsp: Fix encoding of "ETWS Warning Security Info" IE

This is a fixed-length Tag-Value IE.  Our decoder already parsed
it correctly, but the encoder encoded it as TLV, which is wrong.

Change-Id: I7e1d7eab8b8e51acd9a24c38e2d3d30bbf00847a
---
M src/gsm/cbsp.c
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gsm/cbsp.c b/src/gsm/cbsp.c
index b89358d..6ddef33 100644
--- a/src/gsm/cbsp.c
+++ b/src/gsm/cbsp.c
@@ -177,12 +177,15 @@
 		}
 	} else {
 		int wperiod = encode_wperiod(in->u.emergency.warning_period);
+		uint8_t *cur;
 		if (wperiod < 0)
 			return -EINVAL;
 		msgb_tv_put(msg, CBSP_IEI_EMERG_IND, in->u.emergency.indicator);
 		msgb_tv16_put(msg, CBSP_IEI_WARN_TYPE, in->u.emergency.warning_type);
-		msgb_tlv_put(msg, CBSP_IEI_WARN_SEC_INFO, sizeof(in->u.emergency.warning_sec_info),
-			     in->u.emergency.warning_sec_info);
+		/* Tag + fixed length value! */
+		msgb_put_u8(msg, CBSP_IEI_WARN_SEC_INFO);
+		cur = msgb_put(msg, sizeof(in->u.emergency.warning_sec_info));
+		memcpy(cur, in->u.emergency.warning_sec_info, sizeof(in->u.emergency.warning_sec_info));
 		msgb_tv_put(msg, CBSP_IEI_WARNING_PERIOD, wperiod);
 	}
 	return 0;

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I7e1d7eab8b8e51acd9a24c38e2d3d30bbf00847a
Gerrit-Change-Number: 21917
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210103/093d739d/attachment.htm>