From: Matthew Daley <mattd@bugfuzz.com>
Date: Sat, 29 Mar 2014 05:08:08 +0000 (+1300)
Subject: pv-grub: correct sizeof usage
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5309
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0ac7e6a2c5f617c47bb99c9e799a0de53fa3290c;p=xen.git

pv-grub: correct sizeof usage

We were lucky that sizeof(frame) >= sizeof(*frame) anyway.

Signed-off-by: Matthew Daley <mattd@bugfuzz.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/stubdom/grub/mini-os.c b/stubdom/grub/mini-os.c
index 64ab962fee..9d4bcc76d5 100644
--- a/stubdom/grub/mini-os.c
+++ b/stubdom/grub/mini-os.c
@@ -333,7 +333,7 @@ struct frame {
 static void minios_transmit (struct nic *nic, const char *d, unsigned int t,
                              unsigned int s, const char *p)
 {
-    struct frame *frame = alloca(sizeof(frame) + s);
+    struct frame *frame = alloca(sizeof(*frame) + s);
 
     memcpy(frame->dest, d, ETH_ALEN);
     memcpy(frame->src, nic->node_addr, ETH_ALEN);