shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-27 14:03:43 +03:00
Code

sd-dhcp-client: fix strict aliasing issue

Browse Source
This commit is contained in:
Shawn Landden 2015-03-10 20:45:15 -07:00 committed by Ronny Chevalier
parent 42f1ab5009
commit 6ec8e7c763
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsystemd-network/sd-dhcp-client.c
View File

@ -1469,7 +1469,7 @@ static int client_receive_message_udp(sd_event_source *s, int fd,
_cleanup_free_ DHCPMessage *message = NULL;
int buflen = 0, len, r;
const struct ether_addr zero_mac = { { 0, 0, 0, 0, 0, 0 } };
const struct ether_addr *expected_chaddr = NULL;
bool expect_chaddr;
uint8_t expected_hlen = 0;
assert(s);
@ -1514,11 +1514,11 @@ static int client_receive_message_udp(sd_event_source *s, int fd,
if (client->arp_type == ARPHRD_ETHER) {
expected_hlen = ETH_ALEN;
expected_chaddr = (const struct ether_addr *) &client->mac_addr;
expect_chaddr = true;
} else {
/* Non-ethernet links expect zero chaddr */
expected_hlen = 0;
expected_chaddr = &zero_mac;
expect_chaddr = false;
}
if (message->hlen != expected_hlen) {
@ -1526,7 +1526,10 @@ static int client_receive_message_udp(sd_event_source *s, int fd,
return 0;
}
if (memcmp(&message->chaddr[0], expected_chaddr, ETH_ALEN)) {
if (memcmp(&message->chaddr[0], expect_chaddr ?
(void *)&client->mac_addr :
(void *)&zero_mac,
ETH_ALEN)) {
log_dhcp_client(client, "received chaddr does not match "
"expected: ignoring");
return 0;