[S] Change in libosmo-gprs[master]: gprs_sndcp_xid: double check buffer size after writing SAPIs
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/44023?usp=email ) Change subject: gprs_sndcp_xid: double check buffer size after writing SAPIs ...................................................................... gprs_sndcp_xid: double check buffer size after writing SAPIs The function encode_pcomp_applicable_sapis writes the applicable SAPIs to the output buffer. For this it requires 2 bytes. After that, each encoder function writes the remaining information to the buffer. The check at the beginning of each encoder function is sufficient to ensure that the buffer is large enough. However, this remains only true in case the number of bytes that encode_pcomp_applicable_sapis writes is 2. If there are changes to the spec or similar, the function might write more than 2 bytes. So let's place an additional length check to be on the secure side. This patch has been ported from: osmo-sgsn.git I059c903885e21215ad1e6b835f34db2c5f70d87a Related: OS#7095 Change-Id: Iff1dd10644e37e344ca822a91d156e50288fcb30 --- M src/sndcp/sndcp_xid.c 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/23/44023/1 diff --git a/src/sndcp/sndcp_xid.c b/src/sndcp/sndcp_xid.c index bd6bcc2..785f4fb 100644 --- a/src/sndcp/sndcp_xid.c +++ b/src/sndcp/sndcp_xid.c @@ -112,6 +112,10 @@ dst += rc; dst_counter += rc; + /* We still need to write 1 byte from here */ + if (dst_maxlen < dst_counter + 1) + return -ENOMEM; + /* Encode s01 (see also: 3GPP TS 44.065, 6.5.2.1, Table 5) */ if (params->s01 < 0 || params->s01 > 255) return -EINVAL; @@ -150,6 +154,10 @@ dst += rc; dst_counter += rc; + /* We still need to write 7 bytes from here */ + if (dst_maxlen < dst_counter + 7) + return -ENOMEM; + /* Encode F_MAX_PERIOD (see also: 3GPP TS 44.065, 6.5.3.1, Table 6) */ if (params->f_max_period < 1 || params->f_max_period > 65535) return -EINVAL; @@ -229,6 +237,10 @@ dst += rc; dst_counter += rc; + /* We still need to write 36 bytes from here */ + if (dst_maxlen < dst_counter + 36) + return -ENOMEM; + /* Encode MAX_CID (see also: 3GPP TS 44.065, 6.5.4.1, Table 10) */ if (params->max_cid < 0 || params->max_cid > 16383) return -EINVAL; @@ -285,6 +297,10 @@ dst += rc; dst_counter += rc; + /* We still need to write 4 bytes from here */ + if (dst_maxlen < dst_counter + 4) + return -ENOMEM; + /* Encode P0 (see also: 3GPP TS 44.065, 6.6.2.1, Table 7a) */ if (params->p0 < 0 || params->p0 > 3) return -EINVAL; @@ -337,6 +353,10 @@ dst += rc; dst_counter += rc; + /* We still need to write 10 bytes from here */ + if (dst_maxlen < dst_counter + 10) + return -ENOMEM; + /* Encode C0 (see also: 3GPP TS 44.065, 6.6.3.1, Table 7c) */ if (params->c0 != 0x80 && params->c0 != 0xC0) return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/44023?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iff1dd10644e37e344ca822a91d156e50288fcb30 Gerrit-Change-Number: 44023 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier@sysmocom.de>
participants (1)
-
dexter