diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2022-08-11 15:57:40 +0200 |
|---|---|---|
| committer | Neels Janosch Hofmeyr <nhofmeyr@sysmocom.de> | 2022-08-24 17:04:42 +0200 |
| commit | cb724a348482848e2cba34c19ac45afad87fbee6 (patch) | |
| tree | 10c14d5723317797ad1ba02b8ae6eef515a80b0f /include/osmocom/gtlv/gtlv_dec_enc.h | |
| parent | ced68154d278b26bf34c062ef4d086b2925c4218 (diff) | |
gtlv: check memory bounds 1/3: encoding TLV
Introduce a maximum bound of memory access to the osmo_gtlv API.
Properly pass const-ness within the gtlv implementation. This patch adds
membof_const(). The following patch will add the non-const membof()
equivalent, which is not needed in this patch, yet.
Coverity CID#275417 drew my attention to the fact that the gtlv decoding
and encoding does not actually guard against access past the end of the
decoded struct.
We have not yet officially released libosmo-gtlv; also, osmo-upf and
osmo-hnbgw so far only use the libosmo-pfcp API, which "hides" the gtlv
API. Hence just change the API without a backwards compat shim.
Related: CID#275417
Related: SYS#5599
Change-Id: Id8d997c9d5e655ff1842ec69eab6c073875c6330
Diffstat (limited to 'include/osmocom/gtlv/gtlv_dec_enc.h')
| -rw-r--r-- | include/osmocom/gtlv/gtlv_dec_enc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/osmocom/gtlv/gtlv_dec_enc.h b/include/osmocom/gtlv/gtlv_dec_enc.h index 132239f..cb62fe3 100644 --- a/include/osmocom/gtlv/gtlv_dec_enc.h +++ b/include/osmocom/gtlv/gtlv_dec_enc.h @@ -186,9 +186,9 @@ int osmo_gtlvs_decode(void *decoded_struct, unsigned int obj_ofs, struct osmo_gt const struct osmo_gtlv_coding *ie_coding, osmo_gtlv_err_cb err_cb, void *err_cb_data, const struct value_string *iei_strs); -int osmo_gtlvs_encode(struct osmo_gtlv_put *gtlv, const void *decoded_struct, unsigned int obj_ofs, - const struct osmo_gtlv_coding *ie_coding, - osmo_gtlv_err_cb err_cb, void *err_cb_data, const struct value_string *iei_strs); +int osmo_gtlvs_encode(struct osmo_gtlv_put *gtlv, const void *decoded_struct, size_t decoded_struct_size, + unsigned int obj_ofs, const struct osmo_gtlv_coding *ie_coding, osmo_gtlv_err_cb err_cb, + void *err_cb_data, const struct value_string *iei_strs); int osmo_gtlvs_encode_to_str_buf(char *buf, size_t buflen, const void *decoded_struct, unsigned int obj_ofs, const struct osmo_gtlv_coding *ie_coding, const struct value_string *iei_strs); |