grub2/0343-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch
Peter Jones 752ceb1640 Rebased to newer upstream for fedora-29
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-07-10 15:12:02 -04:00

106 lines
3.0 KiB
Diff

From 7be725d0ff77d8ebd0a7e3e3fccf193334c5c319 Mon Sep 17 00:00:00 2001
From: Aaron Miller <aaronmiller@fb.com>
Date: Fri, 29 Jul 2016 17:41:38 +0800
Subject: [PATCH] net: read bracketed ipv6 addrs and port numbers (pjones
fixup)
Various bug fixes related to previous patch.
Signed-off-by: Peter Jones <pjones@redhat.com>
---
grub-core/net/http.c | 6 ++++--
grub-core/net/net.c | 24 ++++++++++++------------
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/grub-core/net/http.c b/grub-core/net/http.c
index f182d7b871d..00737c52750 100644
--- a/grub-core/net/http.c
+++ b/grub-core/net/http.c
@@ -289,7 +289,9 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)),
nb2 = grub_netbuff_alloc (data->chunk_rem);
if (!nb2)
return grub_errno;
- grub_netbuff_put (nb2, data->chunk_rem);
+ err = grub_netbuff_put (nb2, data->chunk_rem);
+ if (err)
+ return grub_errno;
grub_memcpy (nb2->data, nb->data, data->chunk_rem);
if (file->device->net->packs.count >= 20)
{
@@ -405,7 +407,7 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
data->filename, server, port ? port : HTTP_PORT);
data->sock = grub_net_tcp_open (server,
port ? port : HTTP_PORT, http_receive,
- http_err, http_err,
+ http_err, NULL,
file);
if (!data->sock)
{
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 1f887d44b32..a0f4d00f0be 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -441,10 +441,11 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
int word, quaddot = -1;
int bracketed = 0;
- if (ptr[0] == '[') {
- bracketed = 1;
- ptr++;
- }
+ if (ptr[0] == '[')
+ {
+ bracketed = 1;
+ ptr++;
+ }
if (ptr[0] == ':' && ptr[1] != ':')
return 0;
@@ -483,9 +484,8 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
grub_memset (&newip[quaddot], 0, (7 - word) * sizeof (newip[0]));
}
grub_memcpy (ip, newip, 16);
- if (bracketed && *ptr == ']') {
+ if (bracketed && *ptr == ']')
ptr++;
- }
if (rest)
*rest = ptr;
return 1;
@@ -1389,7 +1389,7 @@ grub_net_open_real (const char *name)
char* port_start;
/* ipv6 or port specified? */
if ((port_start = grub_strchr (server, ':')))
- {
+ {
char* ipv6_begin;
if((ipv6_begin = grub_strchr (server, '[')))
{
@@ -1461,14 +1461,13 @@ grub_net_open_real (const char *name)
{
grub_net_t ret = grub_zalloc (sizeof (*ret));
if (!ret)
- return NULL;
- ret->protocol = proto;
- ret->server = grub_strdup (server);
- if (!ret->server)
{
- grub_free (ret);
+ grub_free (host);
return NULL;
}
+ ret->protocol = proto;
+ ret->port = port;
+ ret->server = host;
ret->fs = &grub_net_fs;
return ret;
}
@@ -1543,6 +1542,7 @@ grub_net_open_real (const char *name)
grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("disk `%s' not found"),
name);
+ grub_free (host);
return NULL;
}