diff options
| author | Nickolai Zeldovich <nickolai@csail.mit.edu> | 2012-11-12 17:59:49 +0100 |
|---|---|---|
| committer | Jan Kiszka <jan.kiszka@siemens.com> | 2012-11-15 10:27:14 +0100 |
| commit | 1a89b60885ccc2abf7cc50275fcee70d0347425e (patch) | |
| tree | f85364e7bec058b9142da77a1b0207237f3e42ef | |
| parent | ce34cf72fe508b27a78f83c184142e8d1e6a048a (diff) | |
| download | qemu-1a89b60885ccc2abf7cc50275fcee70d0347425e.zip | |
slirp: Don't crash on packets from 0.0.0.0/8.
LWIP can generate packets with a source of 0.0.0.0, which triggers an
assertion failure in arp_table_add(). Instead of crashing, simply return
to avoid adding an invalid ARP table entry.
Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
| -rw-r--r-- | slirp/arp_table.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/slirp/arp_table.c b/slirp/arp_table.c index 5d7b8acd1d..bf698c1ac5 100644 --- a/slirp/arp_table.c +++ b/slirp/arp_table.c @@ -38,7 +38,9 @@ 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 */ - assert((ip_addr & htonl(~(0xf << 28))) != 0); + if ((ip_addr & htonl(~(0xf << 28))) == 0) { + return; + } if (ip_addr == 0xffffffff || ip_addr == broadcast_addr) { /* Do not register broadcast addresses */ |