grub2/0290-grub-core-net-drivers-ieee1275-ofnet.c-Don-t-attempt.patch
Peter Jones f74b50e380 Rebase to upstream, fix a pile of bugs. The usual.
Signed-off-by: Peter Jones <pjones@redhat.com>
2013-06-12 15:37:08 -04:00

43 lines
1.4 KiB
Diff

From 1776464a786731863fd93bf4ce8171063673dec1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 12 Apr 2013 19:25:16 +0200
Subject: [PATCH 290/482] * grub-core/net/drivers/ieee1275/ofnet.c:
Don't attempt to send more than buffer size.
---
ChangeLog | 5 +++++
grub-core/net/drivers/ieee1275/ofnet.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 1f6ad7c..ced68cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
+ * grub-core/net/drivers/ieee1275/ofnet.c: Don't attempt to send more
+ than buffer size.
+
+2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
+
Disable partmap check on i386-ieee1275 due to openfirmware issues.
2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
index 1acfb73..cd9b159 100644
--- a/grub-core/net/drivers/ieee1275/ofnet.c
+++ b/grub-core/net/drivers/ieee1275/ofnet.c
@@ -79,7 +79,7 @@ send_card_buffer (struct grub_net_card *dev, struct grub_net_buff *pack)
grub_memcpy (dev->txbuf, pack->data, len);
status = grub_ieee1275_write (data->handle, dev->txbuf,
- pack->tail - pack->data, &actual);
+ len, &actual);
if (status)
return grub_error (GRUB_ERR_IO, N_("couldn't send network packet"));
--
1.8.2.1