Addressed copilot's comments.

Author: danielinux

src/port/posix/bsd_socket.c

@@ -1402,7 +1402,7 @@ int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
                         (const struct wolfIP_sockaddr *)addr, addrlen);
             }
             if (ret < 0) {
-                errno = ret;
+                errno = -ret;
                 pthread_mutex_unlock(&wolfIP_mutex);
                 return -1;
             }
@@ -2020,6 +2020,7 @@ void __attribute__((constructor)) init_wolfip_posix() {
     tapdev = wolfIP_getdev(IPSTACK);
     if (!tapdev) {
         fprintf(stderr, "wolfIP_getdev returned NULL\n");
+        pthread_mutex_unlock(&wolfIP_mutex);
         return;
     }
 #if WOLFIP_USE_VDE

src/test/unit/unit.c

@@ -706,8 +706,10 @@ Suite *wolf_suite(void)
     tcase_add_test(tc_proto, test_raw_socket_recv_protocol_mismatch);
     tcase_add_test(tc_proto, test_raw_socket_recv_short_frame_ignored);
     tcase_add_test(tc_proto, test_raw_socket_recv_too_short_drop_returns_einval);
+    tcase_add_test(tc_proto, test_raw_socket_recvfrom_null_addrlen_rejected);
     tcase_add_test(tc_proto, test_raw_socket_recv_uses_ip_total_length);
     tcase_add_test(tc_proto, test_udp_short_frame_does_not_overread);
+    tcase_add_test(tc_proto, test_packet_socket_recvfrom_null_addrlen_rejected);
     tcase_add_test(tc_proto, test_raw_socket_close_clears_entry);
     tcase_add_test(tc_proto, test_packet_socket_close_clears_entry);
     tcase_add_test(tc_proto, test_arp_lookup_ex_basic);

src/test/unit/unit_tests_proto.c

@@ -6461,6 +6461,44 @@ START_TEST(test_raw_socket_recv_too_short_drop_returns_einval)
 }
 END_TEST
 
+START_TEST(test_raw_socket_recvfrom_null_addrlen_rejected)
+{
+    struct wolfIP s;
+    int sd;
+    uint8_t frame_buf[sizeof(struct wolfIP_ip_packet) + 4];
+    struct wolfIP_ip_packet *frame = (struct wolfIP_ip_packet *)frame_buf;
+    uint8_t payload[4] = {1, 2, 3, 4};
+    struct wolfIP_sockaddr_in from;
+    uint8_t rxbuf[32];
+
+    wolfIP_init(&s);
+    mock_link_init(&s);
+    wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);
+
+    sd = wolfIP_sock_socket(&s, AF_INET, IPSTACK_SOCK_RAW, WI_IPPROTO_UDP);
+    ck_assert_int_ge(sd, 0);
+
+    memset(frame, 0, sizeof(frame_buf));
+    memcpy(frame->eth.dst, s.ll_dev[TEST_PRIMARY_IF].mac, 6);
+    memcpy(frame->eth.src, "\xaa\xbb\xcc\xdd\xee\xff", 6);
+    frame->eth.type = ee16(ETH_TYPE_IP);
+    frame->ver_ihl = 0x45;
+    frame->ttl = 32;
+    frame->proto = WI_IPPROTO_UDP;
+    frame->len = ee16(IP_HEADER_LEN + sizeof(payload));
+    frame->src = ee32(0x0A000002U);
+    frame->dst = ee32(0x0A000001U);
+    memcpy(frame->data, payload, sizeof(payload));
+    frame->csum = 0;
+    iphdr_set_checksum(frame);
+
+    wolfIP_recv_ex(&s, TEST_PRIMARY_IF, frame, ETH_HEADER_LEN + IP_HEADER_LEN + sizeof(payload));
+
+    ck_assert_int_eq(wolfIP_sock_recvfrom(&s, sd, rxbuf, sizeof(rxbuf), 0,
+                (struct wolfIP_sockaddr *)&from, NULL), -WOLFIP_EINVAL);
+}
+END_TEST
+
 START_TEST(test_raw_socket_recv_uses_ip_total_length)
 {
     struct wolfIP s;
@@ -6540,6 +6578,38 @@ START_TEST(test_udp_short_frame_does_not_overread)
 }
 END_TEST
 
+START_TEST(test_packet_socket_recvfrom_null_addrlen_rejected)
+{
+#if WOLFIP_PACKET_SOCKETS
+    struct wolfIP s;
+    int sd;
+    uint8_t frame_buf[ETH_HEADER_LEN + 4];
+    struct wolfIP_eth_frame *frame = (struct wolfIP_eth_frame *)frame_buf;
+    struct wolfIP_sockaddr_ll from;
+    uint8_t rxbuf[32];
+
+    wolfIP_init(&s);
+    mock_link_init(&s);
+
+    sd = wolfIP_sock_socket(&s, AF_PACKET, IPSTACK_SOCK_RAW, ETH_TYPE_IP);
+    ck_assert_int_ge(sd, 0);
+
+    memset(frame, 0, sizeof(frame_buf));
+    memcpy(frame->dst, s.ll_dev[TEST_PRIMARY_IF].mac, 6);
+    memcpy(frame->src, "\xaa\xbb\xcc\xdd\xee\xff", 6);
+    frame->type = ETH_TYPE_IP;
+    memset(frame->data, 0xAA, 4);
+
+    wolfIP_recv_ex(&s, TEST_PRIMARY_IF, frame, (uint32_t)sizeof(frame_buf));
+
+    ck_assert_int_eq(wolfIP_sock_recvfrom(&s, sd, rxbuf, sizeof(rxbuf), 0,
+                (struct wolfIP_sockaddr *)&from, NULL), -WOLFIP_EINVAL);
+#else
+    ck_abort_msg("WOLFIP_PACKET_SOCKETS disabled");
+#endif
+}
+END_TEST
+
 START_TEST(test_packet_socket_close_clears_entry)
 {
 #if WOLFIP_PACKET_SOCKETS

src/wolfip.c

@@ -5699,6 +5699,8 @@ int wolfIP_sock_recvfrom(struct wolfIP *s, int sockfd, void *buf, size_t len, in
         rs = wolfIP_rawsocket_from_fd(s, sockfd);
         if (!rs)
             return -WOLFIP_EINVAL;
+        if (sin && !addrlen)
+            return -WOLFIP_EINVAL;
         if (sin && addrlen && *addrlen < sizeof(struct wolfIP_sockaddr_in))
             return -WOLFIP_EINVAL;
         desc = fifo_peek(&rs->rxbuf);
@@ -5736,6 +5738,8 @@ int wolfIP_sock_recvfrom(struct wolfIP *s, int sockfd, void *buf, size_t len, in
         uint8_t *pkt;
         if (!ps)
             return -WOLFIP_EINVAL;
+        if (sll && !addrlen)
+            return -WOLFIP_EINVAL;
         if (sll && addrlen && *addrlen < sizeof(struct wolfIP_sockaddr_ll))
             return -WOLFIP_EINVAL;
         desc = fifo_peek(&ps->rxbuf);