shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 10:51:20 +03:00
Code

Merge pull request #2937 from thom311/master

Browse Source 
dhcp-identifier: handle too large duid_len argument in dhcp_validate_duid_len()
This commit is contained in:
Lennart Poettering 2016-04-01 18:27:23 +02:00
commit 7aa610f149
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd-network/dhcp-identifier.h
View File

@ -75,7 +75,7 @@ int dhcp_identifier_set_iaid(int ifindex, uint8_t *mac, size_t mac_len, void *_i
static inline int dhcp_validate_duid_len(uint16_t duid_type, size_t duid_len) { static inline int dhcp_validate_duid_len(uint16_t duid_type, size_t duid_len) {
struct duid d; struct duid d;
assert_return(duid_len > 0 && duid_len <= MAX_DUID_LEN, -EINVAL); assert(duid_len > 0);
switch (duid_type) { switch (duid_type) {
case DUID_TYPE_LLT: case DUID_TYPE_LLT:
@ -95,6 +95,8 @@ static inline int dhcp_validate_duid_len(uint16_t duid_type, size_t duid_len) {
return -EINVAL; return -EINVAL;
break; break;
default: default:
if (duid_len > sizeof(d.raw))
return -EINVAL;
/* accept unknown type in order to be forward compatible */ /* accept unknown type in order to be forward compatible */
break; break;
} }