From: Olaf Hering Subject: [PATCH 01/46] stubdom: fix lwip compile Date: Mon, 22 Sep 2014 14:59:50 +0200 Message-ID: <1411390835-7348-2-git-send-email-olaf@aepfle.de> References: <1411390835-7348-1-git-send-email-olaf@aepfle.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1411390835-7348-1-git-send-email-olaf@aepfle.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Olaf Hering , Keir Fraser , David Scott , Stefano Stabellini , George Dunlap , Tim Deegan , Ian Jackson , Jan Beulich , Samuel Thibault , Ian Campbell List-Id: xen-devel@lists.xenproject.org stubdom/lwip-x86_64/src/core/dhcp.c: In function 'dhcp_create_request': stubdom/lwip-x86_64/src/core/dhcp.c:1359:71: error: array subscript is above array bounds [-Werror=array-bounds] dhcp->msg_out->chaddr[i] = (i < netif->hwaddr_len) ? netif->hwaddr[i] : 0/* pad byte*/; gcc can not know if hwaddr_len exceeds the hwaddr array size, so force an upper limit to assist gcc. Signed-off-by: Olaf Hering Acked-by: Samuel Thibault --- stubdom/Makefile | 1 + stubdom/lwip.dhcp_create_request-hwaddr_len.patch | 26 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/stubdom/Makefile b/stubdom/Makefile index 6bea68b..88da991 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -145,6 +145,7 @@ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz tar xzf $< mv lwip $@ patch -d $@ -p0 < lwip.patch-cvs + patch -d $@ -p0 < lwip.dhcp_create_request-hwaddr_len.patch touch $@ ############# diff --git a/stubdom/lwip.dhcp_create_request-hwaddr_len.patch b/stubdom/lwip.dhcp_create_request-hwaddr_len.patch new file mode 100644 index 0000000..12f1014 --- /dev/null +++ b/stubdom/lwip.dhcp_create_request-hwaddr_len.patch @@ -0,0 +1,26 @@ +--- + 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*/; + } + for (i = 0; i < DHCP_SNAME_LEN; i++) { + dhcp->msg_out->sname[i] = 0;