add ipv4 test and fix UBSAN alignment issues.

Author: devnexen

ext/sockets/sockets.c

@@ -1684,7 +1684,10 @@ PHP_FUNCTION(socket_recvfrom)
 			switch (protocol) {
 				case ETH_P_IP: {
 					payload = ((unsigned char *)e + ETH_HLEN);
-					struct iphdr *ip = (struct iphdr *)payload;
+					struct iphdr a;
+					memcpy(&a, payload, sizeof(a));
+					//struct iphdr *ip = (struct iphdr *)payload;
+					struct iphdr *ip = &a;
 					size_t tlayer = ip->ihl * 4;
 					size_t totalip = ntohs(ip->tot_len);
 
@@ -1715,21 +1718,27 @@ PHP_FUNCTION(socket_recvfrom)
 
 					switch (ip->protocol) {
 						case IPPROTO_TCP: {
-							struct tcphdr *tcp = (struct tcphdr *)ipdata;
+							struct tcphdr a;
+							memcpy(&a, ipdata, sizeof(a));
+							struct tcphdr *tcp = &a;
 							object_init_ex(&szpayload, tcppacket_ce);
 							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("srcPort"), ntohs(tcp->th_sport));
 							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("dstPort"), ntohs(tcp->th_dport));
 							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("headerSize"), sizeof(*tcp));
 							zend_update_property(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("payload"), &szpayload);
+							Z_DELREF(szpayload);
 							break;
 						}
 						case IPPROTO_UDP: {
-							struct udphdr *udp = (struct udphdr *)ipdata;
+							struct udphdr a;
+							memcpy(&a, ipdata, sizeof(a));
+							struct udphdr *udp = &a;
 							object_init_ex(&szpayload, udppacket_ce);
 							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("srcPort"), ntohs(udp->uh_sport));
 							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("dstPort"), ntohs(udp->uh_dport));
 							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("headerSize"), sizeof(*udp));
 							zend_update_property(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("payload"), &szpayload);
+							Z_DELREF(szpayload);
 							break;
 						}
 						default:
@@ -1749,7 +1758,9 @@ PHP_FUNCTION(socket_recvfrom)
 				}
 				case ETH_P_IPV6: {
 					payload = ((unsigned char *)e + ETH_HLEN);
-					struct ipv6hdr *ip = (struct ipv6hdr *)payload;
+					struct ipv6hdr a;
+					memcpy(&a, payload, sizeof(a));
+					struct ipv6hdr *ip = &a;
 					size_t totalip = sizeof(*ip) + ip->payload_len;
 					char s[INET6_ADDRSTRLEN], d[INET6_ADDRSTRLEN];
 					inet_ntop(AF_INET6, &ip->saddr, s, sizeof(s));

ext/sockets/tests/socket_afpacket.phpt

@@ -51,10 +51,40 @@ if (!function_exists("posix_getuid") || posix_getuid() != 0) {
     try {
     	socket_recvfrom($s_c, $rsp2, strlen($buf), 0, $addr2);
     } catch (\ValueError $e) {
-        echo $e->getMessage();
+        echo $e->getMessage(), PHP_EOL;
     }
 
     socket_close($s_c);
+
+    $s_c     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_ALL);
+    $s_bind  = socket_bind($s_c, 'lo');
+
+    $s_s     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_IP);
+    $v_bind  = socket_bind($s_s, 'lo');
+
+    $ip = hex2bin(
+	    "4500" .
+	    "0028" .
+	    "0000" .
+	    "4000" .
+	    "4006" .
+	    "0000" .
+	    "7f000001" .
+	    "7f000001"
+    );
+    $p = str_repeat("A", 20);  // Total payload 20 + 20 = 40 bytes
+
+    $buf = pack("H12H12n", "ffffffffffff", "000000000000", ETH_P_IP);
+    $buf .= $ip . $p;
+
+    $min_frame_size = 60;
+    $buf .= str_repeat("\x00", max(0, $min_frame_size - strlen($buf)));
+
+    var_dump(socket_sendto($s_s, $buf, strlen($buf), 0, "lo", 1));
+    var_dump(socket_recvfrom($s_c, $rsp, strlen($buf), 0, $addr));
+
+    var_dump($addr);
+    var_dump($rsp);
 ?>
 --EXPECTF--
 bool(true)