aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-02-23 13:58:28 +0100
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-02-23 13:58:28 +0100
commitd9da94a07885334bafcaabb46823de627dd4eb46 (patch)
tree0df57102fd16254dba613ee667458f02fb22ef51
parentb5483d01da02257375e39a268cbc02d449bbcfde (diff)
libdvbv5: desc_ca: cleanup the routine
Add a check if the CA descriptor has at least 4 bytes, and cleanup the logic, in order to avoid using magic numbers, by using offsetof() and sizeof(). Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-rw-r--r--lib/libdvbv5/descriptors/desc_ca.c27
1 files changed, 18 insertions, 9 deletions
diff --git a/lib/libdvbv5/descriptors/desc_ca.c b/lib/libdvbv5/descriptors/desc_ca.c
index 8e885b4f..3e8cc559 100644
--- a/lib/libdvbv5/descriptors/desc_ca.c
+++ b/lib/libdvbv5/descriptors/desc_ca.c
@@ -27,26 +27,35 @@
int dvb_desc_ca_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc)
{
- size_t size = offsetof(struct dvb_desc_ca, dvb_desc_ca_field_last) - offsetof(struct dvb_desc_ca, dvb_desc_ca_field_first);
struct dvb_desc_ca *d = (struct dvb_desc_ca *) desc;
+ const uint8_t *p = buf;
+ size_t len, dlen = desc->length;
+ size_t start;
- memcpy(((uint8_t *) d ) + sizeof(struct dvb_desc), buf, size);
+ start = offsetof(struct dvb_desc_ca, ca_id);
+ len = sizeof(d->ca_id) + sizeof(d->bitfield1);
+
+ if (dlen < len) {
+ dvb_logwarn("CA descriptor is too short wrong: expected %zu, received %zu",
+ len, dlen);
+ return -1;
+ }
+ memcpy(((uint8_t *) d) + start, buf, len);
+ p += len;
bswap16(d->ca_id);
bswap16(d->bitfield1);
- if (d->length > size) {
- size = d->length - size;
- d->privdata = malloc(size);
+ len = dlen - len;
+ if (len) {
+ d->privdata = malloc(len);
if (!d->privdata)
return -1;
- d->privdata_len = size;
- memcpy(d->privdata, buf + 4, size);
+ d->privdata_len = len;
+ memcpy(d->privdata, p, len);
} else {
d->privdata = NULL;
d->privdata_len = 0;
}
- /*dvb_hexdump(parms, "desc ca ", buf, desc->length);*/
- /*dvb_desc_ca_print(parms, desc);*/
return 0;
}

Privacy Policy