From: Olaf Hering <olaf@aepfle.de>
Date: Tue, 7 Oct 2014 14:15:46 +0000 (+0200)
Subject: stubdom: another for fix for lwip compile
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4218
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d172da1bb44462e6ef87e00aa6d12e4996968d4f;p=xen.git

stubdom: another for fix for lwip compile

stubdom/lwip-x86_64/src/core/dhcp.c: In function 'dhcp_create_request':
stubdom/lwip-x86_64/src/core/dhcp.c:1361:64: error: array subscript is above array bounds

The previous attempt to fix the failure above worked fine in SLE11,
openSUSE 13.1 and newer. But gcc-4.5 as included in openSUSE 11.4 still
failed to compile. To fix compilation also with this version of gcc move
the range check right into the code instead of assigning it to a
temporary variable.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/stubdom/lwip.dhcp_create_request-hwaddr_len.patch b/stubdom/lwip.dhcp_create_request-hwaddr_len.patch
index 12f1014839..c43f282c37 100644
--- a/stubdom/lwip.dhcp_create_request-hwaddr_len.patch
+++ b/stubdom/lwip.dhcp_create_request-hwaddr_len.patch
@@ -1,26 +1,13 @@
----
- lwip-x86_64/src/core/dhcp.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
 Index: src/core/dhcp.c
 ===================================================================
 --- src/core/dhcp.c
 +++ src/core/dhcp.c
-@@ -1322,6 +1322,8 @@ dhcp_create_request(struct netif *netif)
- {
-   struct dhcp *dhcp;
-   u16_t i;
-+  /* gcc can not know if hwaddr_len exceeds the hwaddr array size */
-+  u8_t hwaddr_len = netif->hwaddr_len > NETIF_MAX_HWADDR_LEN ? NETIF_MAX_HWADDR_LEN : netif->hwaddr_len;
-   LWIP_ERROR("dhcp_create_request: netif != NULL", (netif != NULL), return ERR_ARG;);
-   dhcp = netif->dhcp;
-   LWIP_ERROR("dhcp_create_request: dhcp != NULL", (dhcp != NULL), return ERR_VAL;);
 @@ -1356,7 +1358,7 @@ dhcp_create_request(struct netif *netif)
    dhcp->msg_out->giaddr.addr = 0;
    for (i = 0; i < DHCP_CHADDR_LEN; i++) {
      /* copy netif hardware address, pad with zeroes */
 -    dhcp->msg_out->chaddr[i] = (i < netif->hwaddr_len) ? netif->hwaddr[i] : 0/* pad byte*/;
-+    dhcp->msg_out->chaddr[i] = (i < hwaddr_len) ? netif->hwaddr[i] : 0/* pad byte*/;
++    dhcp->msg_out->chaddr[i] = (i < (netif->hwaddr_len > NETIF_MAX_HWADDR_LEN ? NETIF_MAX_HWADDR_LEN : netif->hwaddr_len)) ? netif->hwaddr[i] : 0/* pad byte*/;
    }
    for (i = 0; i < DHCP_SNAME_LEN; i++) {
      dhcp->msg_out->sname[i] = 0;