3 files changed, 27 insertions, 14 deletions
diff --git a/accel-pppd/ctrl/ipoe/dhcpv4.c b/accel-pppd/ctrl/ipoe/dhcpv4.c
index 1f77b418..d80a80f3 100644
--- a/accel-pppd/ctrl/ipoe/dhcpv4.c
+++ b/accel-pppd/ctrl/ipoe/dhcpv4.c
@@ -356,9 +356,9 @@ static int dhcpv4_parse_packet(struct dhcpv4_packet *pack, int len)
 		else if (opt->type == 62)
 			pack->client_id = opt;
 		else if (opt->type == 50)
-			pack->request_ip = *(uint32_t *)opt->data;
+			memcpy(&pack->request_ip, opt->data, 4);
 		else if (opt->type == 54)
-			pack->server_id = *(uint32_t *)opt->data;
+			memcpy(&pack->server_id, opt->data, 4);
 	}
 
 	if (pack->msg_type == 0 || pack->msg_type > 8)
diff --git a/accel-pppd/ctrl/ipoe/dhcpv4_options.c b/accel-pppd/ctrl/ipoe/dhcpv4_options.c
index 0175dee7..bffcfa5c 100644
--- a/accel-pppd/ctrl/ipoe/dhcpv4_options.c
+++ b/accel-pppd/ctrl/ipoe/dhcpv4_options.c
@@ -113,18 +113,28 @@ void dhcpv4_print_options(struct dhcpv4_packet *pack, void (*print)(const char *
 
 static void print_int(const struct dhcpv4_option *opt, int elem_size, void (*print)(const char *fmt, ...))
 {
-	if (opt->len == 2)
-		print("%i", ntohs(*(int16_t *)(opt->data)));
-	else
-		print("%i", ntohl(*(int32_t *)(opt->data)));
+	if (opt->len == 2) {
+		int16_t val;
+		memcpy(&val, opt->data, sizeof(val));
+		print("%i", ntohs(val));
+	} else {
+		int32_t val;
+		memcpy(&val, opt->data, sizeof(val));
+		print("%i", ntohl(val));
+	}
 }
 
 static void print_uint(const struct dhcpv4_option *opt, int elem_size, void (*print)(const char *fmt, ...))
 {
-	if (opt->len == 2)
-		print("%u", ntohs(*(uint16_t *)(opt->data)));
-	else
-		print("%u", ntohl(*(uint32_t *)(opt->data)));
+	if (opt->len == 2) {
+		uint16_t val;
+		memcpy(&val, opt->data, sizeof(val));
+		print("%u", ntohs(val));
+	} else {
+		uint32_t val;
+		memcpy(&val, opt->data, sizeof(val));
+		print("%u", ntohl(val));
+	}
 }
 
 static void print_ip(const struct dhcpv4_option *opt, int elem_size, void (*print)(const char *fmt, ...))
@@ -133,7 +143,8 @@ static void print_ip(const struct dhcpv4_option *opt, int elem_size, void (*prin
 	uint32_t ip;
 
 	for (i = 0; i < n; i++) {
-		ip = ntohl(*(uint32_t *)(opt->data + i*elem_size));
+		memcpy(&ip, opt->data + i*elem_size, sizeof(ip));
+		ip = ntohl(ip);
 
 		if (i)
 			print(",");
@@ -170,8 +181,10 @@ static void print_route(const struct dhcpv4_option *opt, int elem_size, void (*p
 	uint32_t ip, gw;
 
 	for (i = 0; i < n; i++) {
-		ip = ntohl(*(uint32_t *)(opt->data + i*8));
-		gw = ntohl(*(uint32_t *)(opt->data + i*8 + 4));
+		memcpy(&ip, opt->data + i*8, sizeof(ip));
+		memcpy(&gw, opt->data + i*8 + 4, sizeof(gw));
+		ip = ntohl(ip);
+		gw = ntohl(gw);
 
 		if (i)
 			print(",");
diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c
index 418b4f2a..6ce35a69 100644
--- a/accel-pppd/ctrl/ipoe/ipoe.c
+++ b/accel-pppd/ctrl/ipoe/ipoe.c
@@ -3483,7 +3483,7 @@ static void load_gw_addr(struct conf_sect_t *sect)
 			continue;
 		}
 
-		a->mask1 = ((1 << a->mask) - 1) << (32 - a->mask);
+		a->mask1 = (int)(((1u << a->mask) - 1u) << (32 - a->mask));
 		list_add_tail(&a->entry, &conf_gw_addr);
 	}
 }