emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix potentially misaligned 32-bit accesses

Browse Source
This commit is contained in:
Denis Vlasenko 2007-01-18 15:42:00 +00:00
parent c966ba46a9
commit 74c9d2365a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
networking/udhcp/dhcpc.c
View File

@ -23,7 +23,7 @@ static int state;
* which holds IPv4 address, and the struct is passed by value (!!) * which holds IPv4 address, and the struct is passed by value (!!)
*/ */
static unsigned long requested_ip; /* = 0 */ static unsigned long requested_ip; /* = 0 */
static unsigned long server_addr; static uint32_t server_addr;
static unsigned long timeout; static unsigned long timeout;
static int packet_num; /* = 0 */ static int packet_num; /* = 0 */
static int fd = -1; static int fd = -1;
@ -413,7 +413,8 @@ int udhcpc_main(int argc, char *argv[])
if (*message == DHCPOFFER) { if (*message == DHCPOFFER) {
temp = get_option(&packet, DHCP_SERVER_ID); temp = get_option(&packet, DHCP_SERVER_ID);
if (temp) { if (temp) {
server_addr = *(uint32_t*)temp; /* can be misaligned, thus memcpy */
memcpy(&server_addr, temp, 4);
xid = packet.xid; xid = packet.xid;
requested_ip = packet.yiaddr; requested_ip = packet.yiaddr;
@ -436,7 +437,9 @@ int udhcpc_main(int argc, char *argv[])
bb_error_msg("no lease time with ACK, using 1 hour lease"); bb_error_msg("no lease time with ACK, using 1 hour lease");
lease = 60 * 60; lease = 60 * 60;
} else { } else {
lease = ntohl(*(uint32_t*)temp); /* can be misaligned, thus memcpy */
memcpy(&lease, temp, 4);
lease = ntohl(lease);
} }
/* enter bound state */ /* enter bound state */