cvs commit: src/sys/netinet ip_divert.c raw_ip.c udp_usrreq.c src/sys/netinet6 raw_ip6.c udp6_usrreq.c

Robert Watson rwatson at FreeBSD.org
Sun Apr 9 16:33:58 UTC 2006


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


More information about the cvs-src mailing list