Changeset a63ff7d in mainline

Timestamp:

2010-11-04T22:59:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60898b6

Parents:

de229f8e

Message:

Do not leak the packet on error in udp_recvfrom_message().

If we don't make it to copying the user data to the client application, do not
forget to release the packet so that it can be used for something else. Also,
pop the packet ID from the socket received queue immediately or else the queue
would become inconsitent on error.

Another approach could be to keep the packet ID in the socket received queue
until the data is successfully copied to the client (just as it was done until
now) and not release the packet in case of error (just as it was done until now,
but for all cases).

The second approach could work better for transient errors as packets would not
be dropped needlessly, but for permanent errors this would render the client
unable to receive any further data.

Rather than complicate the matter, we behave conservatively and drop the packet
whenever we can't deliver it to the client.

File:

• uspace/srv/net/tl/udp/udp.c (modified) (2 diffs)

uspace/srv/net/tl/udp/udp.c

@@ -626 +626 @@
 
         // get the next received packet
-        packet_id = dyn_fifo_value(&socket->received);
+        packet_id = dyn_fifo_pop(&socket->received);
         if (packet_id < 0)
                 return NO_DATA;
@@ -650 +650 @@
         rc = data_reply(addr, *addrlen);
         if (rc != EOK)
-                return rc;
+                return udp_release_and_return(packet, rc);
 
         // trim the header
         rc = packet_trim(packet, UDP_HEADER_SIZE, 0);
         if (rc != EOK)
-                return rc;
+                return udp_release_and_return(packet, rc);
 
         // reply the packets
         rc = socket_reply_packets(packet, &length);
         if (rc != EOK)
-                return rc;
-
-        dyn_fifo_pop(&socket->received);
+                return udp_release_and_return(packet, rc);
 
         // release the packet and return the total length