From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 23 Aug 2013 16:36:48 +0000 (+0100)
Subject: slirp/arp_table.c: Avoid shifting into sign bit of signed integers
X-Git-Tag: v1.7.0-rc0~137^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed6bc28e8a448b9005af50eed12893c5f7711c6e;p=thirdparty%2Fqemu.git

slirp/arp_table.c: Avoid shifting into sign bit of signed integers

"0xf << 28" shifts right into the sign bit, since 0xf is a signed
integer. Use the 'U' suffix to force an unsigned shift to avoid
this undefined behaviour and a clang sanitizer warning.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/slirp/arp_table.c b/slirp/arp_table.c
index bf698c1ac57..ecdb0baee4f 100644
--- a/slirp/arp_table.c
+++ b/slirp/arp_table.c
@@ -38,7 +38,7 @@ void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN])
                 ethaddr[3], ethaddr[4], ethaddr[5]));
 
     /* Check 0.0.0.0/8 invalid source-only addresses */
-    if ((ip_addr & htonl(~(0xf << 28))) == 0) {
+    if ((ip_addr & htonl(~(0xfU << 28))) == 0) {
         return;
     }
 
@@ -74,7 +74,7 @@ bool arp_table_search(Slirp *slirp, uint32_t ip_addr,
     DEBUG_ARG("ip = 0x%x", ip_addr);
 
     /* Check 0.0.0.0/8 invalid source-only addresses */
-    assert((ip_addr & htonl(~(0xf << 28))) != 0);
+    assert((ip_addr & htonl(~(0xfU << 28))) != 0);
 
     /* If broadcast address */
     if (ip_addr == 0xffffffff || ip_addr == broadcast_addr) {