diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-01-30 01:31:32 +0100 |
|---|---|---|
| committer | fixeria <vyanitskiy@sysmocom.de> | 2021-02-01 17:47:54 +0000 |
| commit | 943133cad89cc133dbe9fba8fc19249ce57d33ad (patch) | |
| tree | 41e4c160300603cf63a0bc897a83ecccd071e874 /tests/sms | |
| parent | 44ac4f6c9294abdbc5344b68b49b088e7f67b0ff (diff) | |
gsm_7bit_encode_n(): fix integer overflow in gsm_septets2octets()
Using 'uint8_t' for the length argument is definitely a bad idea.
Because of this, packing more than 255 septets would not work as
expected. Deprecate the old function and use 'size_t' instead.
Change-Id: Ib1aac538afeb0a5c76a1df472d555139a496e12e
Diffstat (limited to 'tests/sms')
| -rw-r--r-- | tests/sms/sms_test.c | 4 | ||||
| -rw-r--r-- | tests/sms/sms_test.ok | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/tests/sms/sms_test.c b/tests/sms/sms_test.c index c7f47e20..3e14529c 100644 --- a/tests/sms/sms_test.c +++ b/tests/sms/sms_test.c @@ -384,7 +384,7 @@ int main(int argc, char** argv) memcpy(tmp, septet_data, concatenated_part1_septet_length); /* In our case: test_multiple_decode[0].ud_hdr_ind equals number of padding bits*/ - octet_length = gsm_septets2octets(coded, tmp, concatenated_part1_septet_length, test_multiple_encode[0].ud_hdr_ind); + octet_length = gsm_septet_pack(coded, tmp, concatenated_part1_septet_length, test_multiple_encode[0].ud_hdr_ind); /* copy header */ memset(tmp, 0x42, sizeof(tmp)); @@ -402,7 +402,7 @@ int main(int argc, char** argv) memcpy(tmp, septet_data + concatenated_part1_septet_length, concatenated_part2_septet_length); /* In our case: test_multiple_decode[1].ud_hdr_ind equals number of padding bits*/ - octet_length = gsm_septets2octets(coded, tmp, concatenated_part2_septet_length, test_multiple_encode[1].ud_hdr_ind); + octet_length = gsm_septet_pack(coded, tmp, concatenated_part2_septet_length, test_multiple_encode[1].ud_hdr_ind); /* copy header */ memset(tmp, 0x42, sizeof(tmp)); diff --git a/tests/sms/sms_test.ok b/tests/sms/sms_test.ok index 724c166b..de1fce3a 100644 --- a/tests/sms/sms_test.ok +++ b/tests/sms/sms_test.ok @@ -21,20 +21,15 @@ Result: len(12) data(14 d0 4f 78 d9 2d 9c 0e c3 e2 31 19 ) Running test_enc_large_msg gsm_7bit_encode_n(len=2048) processed 2048 septets (expected 2048): OK -gsm_7bit_encode_n(len=2048) used 0 octets in the buffer (expected 1792): FAIL - Unexpected chunk at enc_buf[0:7]: 00 00 00 00 00 00 00 +gsm_7bit_encode_n(len=2048) used 1792 octets in the buffer (expected 1792): OK gsm_7bit_encode_n(len=1024) processed 1024 septets (expected 1024): OK -gsm_7bit_encode_n(len=1024) used 0 octets in the buffer (expected 896): FAIL - Unexpected chunk at enc_buf[0:7]: 00 00 00 00 00 00 00 +gsm_7bit_encode_n(len=1024) used 896 octets in the buffer (expected 896): OK gsm_7bit_encode_n(len=555) processed 555 septets (expected 555): OK -gsm_7bit_encode_n(len=555) used 38 octets in the buffer (expected 486): FAIL - Unexpected chunk at enc_buf[35:6]: c1 60 10 00 00 00 +gsm_7bit_encode_n(len=555) used 486 octets in the buffer (expected 486): OK gsm_7bit_encode_n(len=512) processed 512 septets (expected 512): OK -gsm_7bit_encode_n(len=512) used 0 octets in the buffer (expected 448): FAIL - Unexpected chunk at enc_buf[0:7]: 00 00 00 00 00 00 00 +gsm_7bit_encode_n(len=512) used 448 octets in the buffer (expected 448): OK gsm_7bit_encode_n(len=260) processed 260 septets (expected 260): OK -gsm_7bit_encode_n(len=260) used 4 octets in the buffer (expected 228): FAIL - Unexpected chunk at enc_buf[0:6]: c1 60 30 08 00 00 +gsm_7bit_encode_n(len=260) used 228 octets in the buffer (expected 228): OK gsm_7bit_encode_n(len=255) processed 255 septets (expected 255): OK gsm_7bit_encode_n(len=255) used 224 octets in the buffer (expected 224): OK gsm_7bit_encode_n(len=250) processed 250 septets (expected 250): OK |