diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-12-19 11:27:10 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-12-23 16:19:35 +0100 |
| commit | dd3114deb04184b38da6a9bd2d1e602985380c55 (patch) | |
| tree | eb1b05a88f17b9eb52812bde4774eb229d4b2917 | |
| parent | c9fbdf3cb0d31e6ca24baa5a43a56d878317a620 (diff) | |
| download | NetworkManager-dd3114deb04184b38da6a9bd2d1e602985380c55.tar.gz | |
dhcp: nettools: fix parsing of classless routes option
Fixes: 6adade6f21d5 ('dhcp: add nettools dhcp4 client')
| -rw-r--r-- | src/dhcp/nm-dhcp-nettools.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c index f59b27e356..fa5abda539 100644 --- a/src/dhcp/nm-dhcp-nettools.c +++ b/src/dhcp/nm-dhcp-nettools.c @@ -128,6 +128,7 @@ lease_option_next_route (struct in_addr *destp, uint8_t *data = *datap; size_t n_data = *n_datap; uint8_t plen; + uint8_t bytes; if (classless) { if (!lease_option_consume (&plen, sizeof (plen), &data, &n_data)) @@ -136,7 +137,9 @@ lease_option_next_route (struct in_addr *destp, if (plen > 32) return FALSE; - if (!lease_option_consume (&dest, plen / 8, &data, &n_data)) + bytes = plen == 0 ? 0 : ((plen - 1) / 8) + 1; + + if (!lease_option_consume (&dest, bytes, &data, &n_data)) return FALSE; } else { if (!lease_option_next_in_addr (&dest, &data, &n_data)) |