[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2] slirp: Don't crash on packets from 0.0.0.0/8
From: |
Jan Kiszka |
Subject: |
Re: [Qemu-devel] [PATCH v2] slirp: Don't crash on packets from 0.0.0.0/8. |
Date: |
Thu, 15 Nov 2012 10:27:40 +0100 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
On 2012-11-12 17:59, Nickolai Zeldovich wrote:
> 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 <address@hidden>
> ---
> slirp/arp_table.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> Change from v1: adhere to qemu's code style (put braces around all
> indentation blocks).
>
>
> diff --git a/slirp/arp_table.c b/slirp/arp_table.c
> index 5d7b8ac..bf698c1 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 */
>
Thanks, applied to slirp queue.
Jan
--
Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
Corporate Competence Center Embedded Linux