morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

lldp: fix parsing of TLV length

Browse Source 
tlv_packet_read_bytes() and tlv_packet_read_string() returned the
wrong length when called after other functions which modify the offset
in the container.

In other words, if the TLV data length is X and we do a
tlv_packet_read_u8(), a subsequent tlv_packet_read_bytes() should
return a length of (X - 1).
This commit is contained in:
Beniamino Galvani
2015-09-29 17:48:37 +02:00
parent 0037c2dc54
commit 29eca2ff89
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsystemd-network/lldp-tlv.c
View File

@@ -240,9 +240,9 @@ int tlv_packet_read_string(tlv_packet *m, char **data, uint16_t *data_length) {
return r;
*data = (char *) val;
*data_length = m->container->length;
*data_length = m->container->data + m->container->length - m->container->read_pos;
m->container->read_pos += m->container->length;
m->container->read_pos += *data_length;
return 0;
}
@@ -258,9 +258,9 @@ int tlv_packet_read_bytes(tlv_packet *m, uint8_t **data, uint16_t *data_length)
return r;
*data = (uint8_t *) val;
*data_length = m->container->length;
*data_length = m->container->data + m->container->length - m->container->read_pos;
m->container->read_pos += m->container->length;
m->container->read_pos += *data_length;
return 0;
}
@@ -336,7 +336,7 @@ int lldp_tlv_packet_enter_container(tlv_packet *m, uint16_t type) {
m->container->read_pos = s->data;
if (!m->container->read_pos) {
m->container = 0;
m->container = NULL;
return -1;
}
@@ -364,7 +364,7 @@ int lldp_tlv_packet_enter_container_oui(tlv_packet *m, const uint8_t *oui, uint8
m->container->read_pos = s->data;
if (!m->container->read_pos) {
m->container = 0;
m->container = NULL;
return -1;
}