Change in osmo-pcu[master]: csn1: fix M_CHOICE: restirct maximum length of the choice list
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/18430 )
Change subject: csn1: fix M_CHOICE: restirct maximum length of the choice list
..
csn1: fix M_CHOICE: restirct maximum length of the choice list
The current implementation is not capable of handling more than
256 (UCHAR_MAX) selectors in the choice list. Let's document
this and add a guard check to the M_CHOICE handler.
Change-Id: I40c3c5b9be892804c6cd71cbb907af469ce5d769
---
M src/csn1.c
M src/csn1.h
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, approved
diff --git a/src/csn1.c b/src/csn1.c
index 3db1e13..3347a64 100644
--- a/src/csn1.c
+++ b/src/csn1.c
@@ -495,6 +495,8 @@
/* Make sure that the list of choice items is not empty */
if (!count)
return ProcessError(readIndex, "csnStreamDecoder",
CSN_ERROR_IN_SCRIPT, pDescr);
+else if (count > 255) /* We can handle up to 256 (UCHAR_MAX) selectors
*/
+ return ProcessError(readIndex, "csnStreamDecoder",
CSN_ERROR_IN_SCRIPT, pDescr);
while (count > 0)
{
diff --git a/src/csn1.h b/src/csn1.h
index d178ada..7eef5c8 100644
--- a/src/csn1.h
+++ b/src/csn1.h
@@ -490,7 +490,8 @@
* is the part of the message. In the CSN_CHOICE case, this rule does not
* apply. There is free but predefined mapping of the element of the union and
* the value which addresses this element.
- * The value of the address is called a selector.
+ * The value of the address is called a selector. Up to 256 (UCHAR_MAX) unique
+ * selectors can be handled, longer choice list would cause
CSN_ERROR_IN_SCRIPT.
* After unpacking, this value is then converted to the sequential number of
the
* element in the union and stored in the UnionType variable.
* Par1: C structure name
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/18430
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I40c3c5b9be892804c6cd71cbb907af469ce5d769
Gerrit-Change-Number: 18430
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-pcu[master]: csn1: fix M_CHOICE: restirct maximum length of the choice list
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/18430 ) Change subject: csn1: fix M_CHOICE: restirct maximum length of the choice list .. Patch Set 1: > Patch Set 1: Code-Review+2 > > Is this really an issue somewhere? I don't think so, but API-wise it makes sense to do this check. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/18430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I40c3c5b9be892804c6cd71cbb907af469ce5d769 Gerrit-Change-Number: 18430 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 May 2020 08:50:56 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: csn1: fix M_CHOICE: restirct maximum length of the choice list
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/18430 ) Change subject: csn1: fix M_CHOICE: restirct maximum length of the choice list .. Patch Set 1: Code-Review+2 Is this really an issue somewhere? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/18430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I40c3c5b9be892804c6cd71cbb907af469ce5d769 Gerrit-Change-Number: 18430 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 May 2020 08:45:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: csn1: fix M_CHOICE: restirct maximum length of the choice list
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/18430 ) Change subject: csn1: fix M_CHOICE: restirct maximum length of the choice list .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/18430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I40c3c5b9be892804c6cd71cbb907af469ce5d769 Gerrit-Change-Number: 18430 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 May 2020 07:55:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: csn1: fix M_CHOICE: restirct maximum length of the choice list
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/18430 )
Change subject: csn1: fix M_CHOICE: restirct maximum length of the choice list
..
csn1: fix M_CHOICE: restirct maximum length of the choice list
The current implementation is not capable of handling more than
256 (UCHAR_MAX) selectors in the choice list. Let's document
this and add a guard check to the M_CHOICE handler.
Change-Id: I40c3c5b9be892804c6cd71cbb907af469ce5d769
---
M src/csn1.c
M src/csn1.h
2 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/30/18430/1
diff --git a/src/csn1.c b/src/csn1.c
index 3db1e13..3347a64 100644
--- a/src/csn1.c
+++ b/src/csn1.c
@@ -495,6 +495,8 @@
/* Make sure that the list of choice items is not empty */
if (!count)
return ProcessError(readIndex, "csnStreamDecoder",
CSN_ERROR_IN_SCRIPT, pDescr);
+else if (count > 255) /* We can handle up to 256 (UCHAR_MAX) selectors
*/
+ return ProcessError(readIndex, "csnStreamDecoder",
CSN_ERROR_IN_SCRIPT, pDescr);
while (count > 0)
{
diff --git a/src/csn1.h b/src/csn1.h
index d178ada..7eef5c8 100644
--- a/src/csn1.h
+++ b/src/csn1.h
@@ -490,7 +490,8 @@
* is the part of the message. In the CSN_CHOICE case, this rule does not
* apply. There is free but predefined mapping of the element of the union and
* the value which addresses this element.
- * The value of the address is called a selector.
+ * The value of the address is called a selector. Up to 256 (UCHAR_MAX) unique
+ * selectors can be handled, longer choice list would cause
CSN_ERROR_IN_SCRIPT.
* After unpacking, this value is then converted to the sequential number of
the
* element in the union and stored in the UnionType variable.
* Par1: C structure name
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/18430
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I40c3c5b9be892804c6cd71cbb907af469ce5d769
Gerrit-Change-Number: 18430
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
