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