diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-18 15:42:00 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-18 15:42:00 +0000 |
| commit | 74c9d2365a9ada53d8967a280a858acdc98f81fb (patch) | |
| tree | 5d76c1faae4f411f99b45af9862182bbb89c02c4 /networking/udhcp | |
| parent | c966ba46a9fb1bf3b3f697f4c838c284ce8ac040 (diff) | |
| download | busybox-74c9d2365a9ada53d8967a280a858acdc98f81fb.tar.gz | |
fix potentially misaligned 32-bit accesses
Diffstat (limited to 'networking/udhcp')
| -rw-r--r-- | networking/udhcp/dhcpc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index e042da89a..e48e1f25e 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c @@ -23,7 +23,7 @@ static int state; * which holds IPv4 address, and the struct is passed by value (!!) */ static unsigned long requested_ip; /* = 0 */ -static unsigned long server_addr; +static uint32_t server_addr; static unsigned long timeout; static int packet_num; /* = 0 */ static int fd = -1; @@ -413,7 +413,8 @@ int udhcpc_main(int argc, char *argv[]) if (*message == DHCPOFFER) { temp = get_option(&packet, DHCP_SERVER_ID); if (temp) { - server_addr = *(uint32_t*)temp; + /* can be misaligned, thus memcpy */ + memcpy(&server_addr, temp, 4); xid = packet.xid; 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"); lease = 60 * 60; } else { - lease = ntohl(*(uint32_t*)temp); + /* can be misaligned, thus memcpy */ + memcpy(&lease, temp, 4); + lease = ntohl(lease); } /* enter bound state */ |