Blame SOURCES/0237-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch

fd0330
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
fd0330
From: Daniel Axtens <dja@axtens.net>
fd0330
Date: Tue, 1 Mar 2022 23:14:15 +1100
fd0330
Subject: [PATCH] net/http: Do not tear down socket if it's already been torn
fd0330
 down
fd0330
fd0330
It's possible for data->sock to get torn down in tcp error handling.
fd0330
If we unconditionally tear it down again we will end up doing writes
fd0330
to an offset of the NULL pointer when we go to tear it down again.
fd0330
fd0330
Detect if it has been torn down and don't do it again.
fd0330
fd0330
Signed-off-by: Daniel Axtens <dja@axtens.net>
fd0330
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
fd0330
(cherry picked from commit ec233d3ecf995293304de443579aab5c46c49e85)
fd0330
---
fd0330
 grub-core/net/http.c | 5 +++--
fd0330
 1 file changed, 3 insertions(+), 2 deletions(-)
fd0330
fd0330
diff --git a/grub-core/net/http.c b/grub-core/net/http.c
fd0330
index 7f878b5615..19cb8768e3 100644
fd0330
--- a/grub-core/net/http.c
fd0330
+++ b/grub-core/net/http.c
fd0330
@@ -427,7 +427,7 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
fd0330
       return err;
fd0330
     }
fd0330
 
fd0330
-  for (i = 0; !data->headers_recv && i < 100; i++)
fd0330
+  for (i = 0; data->sock && !data->headers_recv && i < 100; i++)
fd0330
     {
fd0330
       grub_net_tcp_retransmit ();
fd0330
       grub_net_poll_cards (300, &data->headers_recv);
fd0330
@@ -435,7 +435,8 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
fd0330
 
fd0330
   if (!data->headers_recv)
fd0330
     {
fd0330
-      grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
fd0330
+      if (data->sock)
fd0330
+        grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
fd0330
       if (data->err)
fd0330
 	{
fd0330
 	  char *str = data->errmsg;