Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Apr 2006 17:33:52 +0100 (BST)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Pawel Jakub Dawidek <pjd@FreeBSD.org>
Cc:        cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   Re: cvs commit: src/sys/netinet ip_divert.c raw_ip.c udp_usrreq.c src/sys/netinet6 raw_ip6.c udp6_usrreq.c
Message-ID:  <20060409173134.G55490@fledge.watson.org>
In-Reply-To: <20060409085559.GF2135@garage.freebsd.pl>
References:  <200604011620.k31GKsGQ028619@repoman.freebsd.org> <20060409085559.GF2135@garage.freebsd.pl>

next in thread | previous in thread | raw e-mail | index | archive | help

On Sun, 9 Apr 2006, Pawel Jakub Dawidek wrote:

> +> -	if (inp == 0) {
> +> -		INP_INFO_WUNLOCK(&divcbinfo);
> +> -		return EINVAL;
> +> -	}
> +> +	KASSERT(inp == NULL, ("div_bind: inp == NULL"));
>
> This change seems to be wrong. EINVAL was returned when inp is equal to NULL 
> and now you assert it. I think panic message is correct, but the check 
> isn't. I haven't triggered the assert, though.

This has been fixed already in ip_divert.c:1.117.  Thanks for the careful 
review, though :-).

> +> -	if (inp != 0) {
> +> -		INP_INFO_WUNLOCK(&udbinfo);
> +> -		return EINVAL;
> +> -	}
> +> -
> +> +	KASSERT(inp == NULL, ("udp6_attach: inp == NULL"));
>
> Incorrect panic message here? Should be "udp6_attach: inp != NULL".

Fixed, thanks!

Robert N M Watson



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060409173134.G55490>