From d4561cd080b6511e62bfbf27f443262fd7a5e5be Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Sat, 16 Jan 2016 20:59:50 +0300
Subject: [PATCH] tcp: fix memory leaks

Found by: Coverity scan.
CID: 96639, 96647
---
 grub-core/net/tcp.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c
index 576f68498..e8ad34b84 100644
--- a/grub-core/net/tcp.c
+++ b/grub-core/net/tcp.c
@@ -606,10 +606,15 @@ grub_net_tcp_open (char *server,
 
   nb = grub_netbuff_alloc (sizeof (*tcph) + 128);
   if (!nb)
-    return NULL;
+    {
+      grub_free (socket);
+      return NULL;
+    }
+
   err = grub_netbuff_reserve (nb, 128);
   if (err)
     {
+      grub_free (socket);
       grub_netbuff_free (nb);
       return NULL;
     }
@@ -617,12 +622,14 @@ grub_net_tcp_open (char *server,
   err = grub_netbuff_put (nb, sizeof (*tcph));
   if (err)
     {
+      grub_free (socket);
       grub_netbuff_free (nb);
       return NULL;
     }
   socket->pq = grub_priority_queue_new (sizeof (struct grub_net_buff *), cmp);
   if (!socket->pq)
     {
+      grub_free (socket);
       grub_netbuff_free (nb);
       return NULL;
     }
@@ -978,6 +985,7 @@ grub_net_recv_tcp_packet (struct grub_net_buff *nb,
 					    cmp);
 	if (!sock->pq)
 	  {
+	    grub_free (sock);
 	    grub_netbuff_free (nb);
 	    return grub_errno;
 	  }