diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2018-11-21 18:19:04 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-11-22 10:00:11 +0100 |
| commit | 73b572e001b8f3e36c35b6e7aa59daac8be3c745 (patch) | |
| tree | 9f7baf687b0f5c51493650b2b5e34b88cd656523 | |
| parent | 21a7c4ccea484bbb8249d39f835dcd82ca849502 (diff) | |
| download | NetworkManager-73b572e001b8f3e36c35b6e7aa59daac8be3c745.tar.gz | |
lldp: fix parsing of vlan-name attribute
We used to read 3 bytes after the TLV, fix this.
Also, check that string length is at most 32 bytes as specified in
figure E.3 of IEEE 802.1AB-2009.
Fixes: 18133ea1428648781dba74c26dd5d118e8d5ce33
https://bugzilla.redhat.com/show_bug.cgi?id=1652210
(cherry picked from commit e9097787102442d1db6e1ebfbe07140bf05318a2)
(cherry picked from commit 05c27c3c504c776b2ff3f3e34e717300c5ac1a0f)
(cherry picked from commit 6d4ad477b81e495a35767c996c9f4ad69f58e135)
(cherry picked from commit b97d38e5799834474004b6cba2ddda3223ac5b1d)
| -rw-r--r-- | src/devices/nm-lldp-listener.c | 4 | ||||
| -rw-r--r-- | src/devices/tests/test-lldp.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c index bfd631f0fd..b133786c56 100644 --- a/src/devices/nm-lldp-listener.c +++ b/src/devices/nm-lldp-listener.c @@ -530,11 +530,13 @@ lldp_neighbor_new (sd_lldp_neighbor *neighbor_sd, GError **error) l = data8[2]; if (len != 3 + l) continue; + if (l > 32) + continue; _lldp_attr_set_uint32 (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_VID, _access_uint16 (&data8[0])); _lldp_attr_set_str_ptr (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_VLAN_NAME, - &data8[3], len); + &data8[3], l); break; } default: diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c index 1e600cdf1a..5c6ee9d021 100644 --- a/src/devices/tests/test-lldp.c +++ b/src/devices/tests/test-lldp.c @@ -220,11 +220,10 @@ TEST_RECV_FRAME_DEFINE (_test_recv_data1_frame0, 0x01, 0xe8, 0xfe, 0x07, 0x00, 0x80, 0xc2, 0x02, /* IEEE 802.1 - Port and Protocol VLAN ID */ 0x01, 0x00, 0x00, - 0xfe, 0x17, 0x00, 0x80, 0xc2, 0x03, /* IEEE 802.1 - VLAN Name */ - 0x01, 0xe8, 0x10, 0x76, 0x32, 0x2d, + 0xfe, 0x16, 0x00, 0x80, 0xc2, 0x03, /* IEEE 802.1 - VLAN Name */ + 0x01, 0xe8, 0x0f, 0x76, 0x32, 0x2d, 0x30, 0x34, 0x38, 0x38, 0x2d, 0x30, 0x33, 0x2d, 0x30, 0x35, 0x30, 0x35, - 0x00, 0xfe, 0x05, 0x00, 0x80, 0xc2, 0x04, /* IEEE 802.1 - Protocol Identity */ 0x00, 0x00, 0x00 /* End of LLDPDU */ |