mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
81987f4958
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From c0fa21c8898437747ce093884e6aba48d45ac329 Mon Sep 17 00:00:00 2001
|
|
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
|
Date: Wed, 5 Feb 2014 09:42:42 -0200
|
|
Subject: [PATCH 078/206] trim arp packets with abnormal size
|
|
|
|
GRUB uses arp request to create the arp response. If the incoming packet
|
|
is foobared, GRUB needs to trim the arp response packet before sending it.
|
|
---
|
|
grub-core/net/arp.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
|
|
index 54306e3b16d..2083b5a4b91 100644
|
|
--- a/grub-core/net/arp.c
|
|
+++ b/grub-core/net/arp.c
|
|
@@ -150,6 +150,12 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
|
|
if (grub_net_addr_cmp (&inf->address, &target_addr) == 0
|
|
&& arp_packet->op == grub_cpu_to_be16_compile_time (ARP_REQUEST))
|
|
{
|
|
+ if ((nb->tail - nb->data) > 50)
|
|
+ {
|
|
+ grub_dprintf ("net", "arp packet with abnormal size (%d bytes).\n",
|
|
+ nb->tail - nb->data);
|
|
+ nb->tail = nb->data + 50;
|
|
+ }
|
|
grub_net_link_level_address_t target;
|
|
struct grub_net_buff nb_reply;
|
|
struct arppkt *arp_reply;
|
|
--
|
|
2.15.0
|
|
|