[TCPIP]

- Fix IPPacket double free in IPSendDatagram failure case

svn path=/trunk/; revision=54620

diff --git a/reactos/lib/drivers/ip/network/icmp.c b/reactos/lib/drivers/ip/network/icmp.c
index 5af8086..42815ba 100644 (file)
--- a/reactos/lib/drivers/ip/network/icmp.c
+++ b/reactos/lib/drivers/ip/network/icmp.c
@@ -24,29 +24,6 @@ NTSTATUS ICMPShutdown()
     return STATUS_SUCCESS;
 }
 
-VOID SendICMPComplete(
-    PVOID Context,
-    PNDIS_PACKET Packet,
-    NDIS_STATUS NdisStatus)
-/*
- * FUNCTION: ICMP datagram transmit completion handler
- * ARGUMENTS:
- *     Context    = Pointer to context infomation (IP_PACKET)
- *     Packet     = Pointer to NDIS packet
- *     NdisStatus = Status of transmit operation
- * NOTES:
- *     This routine is called by IP when a ICMP send completes
- */
-{
-    TI_DbgPrint(DEBUG_ICMP, ("Freeing NDIS packet (%X).\n", Packet));
-
-    /* Free packet */
-    FreeNdisPacket(Packet);
-
-    TI_DbgPrint(DEBUG_ICMP, ("Done\n"));
-}
-
-
 BOOLEAN PrepareICMPPacket(
     PADDRESS_FILE AddrFile,
     PIP_INTERFACE Interface,
@@ -219,10 +196,7 @@ NTSTATUS ICMPSendDatagram(
 
     Status = IPSendDatagram(&Packet, NCE);
     if (!NT_SUCCESS(Status))
-    {
-        Packet.Free(&Packet);
         return Status;
-    }
     
     *DataUsed = DataSize;
 

diff --git a/reactos/lib/drivers/ip/transport/rawip/rawip.c b/reactos/lib/drivers/ip/transport/rawip/rawip.c
index f003f6f..f9ce896 100644 (file)
--- a/reactos/lib/drivers/ip/transport/rawip/rawip.c
+++ b/reactos/lib/drivers/ip/transport/rawip/rawip.c
@@ -254,10 +254,7 @@ NTSTATUS RawIPSendDatagram(
 
     Status = IPSendDatagram(&Packet, NCE);
     if (!NT_SUCCESS(Status))
-    {
-        Packet.Free(&Packet);
         return Status;
-    }
 
     *DataUsed = DataSize;
 

diff --git a/reactos/lib/drivers/ip/transport/tcp/if.c b/reactos/lib/drivers/ip/transport/tcp/if.c
index 16c993b..9531738 100644 (file)
--- a/reactos/lib/drivers/ip/transport/tcp/if.c
+++ b/reactos/lib/drivers/ip/transport/tcp/if.c
@@ -61,10 +61,7 @@ TCPSendDataCallback(struct netif *netif, struct pbuf *p, struct ip_addr *dest)
 
     NdisStatus = IPSendDatagram(&Packet, NCE);
     if (!NT_SUCCESS(NdisStatus))
-    {
-        Packet.Free(&Packet);
         return ERR_RTE;
-    }
 
     return 0;
 }

diff --git a/reactos/lib/drivers/ip/transport/udp/udp.c b/reactos/lib/drivers/ip/transport/udp/udp.c
index a22ff02..6cc56a1 100644 (file)
--- a/reactos/lib/drivers/ip/transport/udp/udp.c
+++ b/reactos/lib/drivers/ip/transport/udp/udp.c
@@ -230,10 +230,7 @@ NTSTATUS UDPSendDatagram(
 
     Status = IPSendDatagram(&Packet, NCE);
     if (!NT_SUCCESS(Status))
-    {
-        Packet.Free(&Packet);
         return Status;
-    }
 
     *DataUsed = DataSize;