From owner-cvs-src@FreeBSD.ORG  Sun Apr  9 16:33:58 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 361F216A441;
	Sun,  9 Apr 2006 16:33:58 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5061943D5D;
	Sun,  9 Apr 2006 16:33:53 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from fledge.watson.org (fledge.watson.org [209.31.154.41])
	by cyrus.watson.org (Postfix) with ESMTP id 88A6A46B1E;
	Sun,  9 Apr 2006 12:33:52 -0400 (EDT)
Date: Sun, 9 Apr 2006 17:33:52 +0100 (BST)
From: Robert Watson <rwatson@FreeBSD.org>
X-X-Sender: robert@fledge.watson.org
To: Pawel Jakub Dawidek <pjd@FreeBSD.org>
In-Reply-To: <20060409085559.GF2135@garage.freebsd.pl>
Message-ID: <20060409173134.G55490@fledge.watson.org>
References: <200604011620.k31GKsGQ028619@repoman.freebsd.org>
	<20060409085559.GF2135@garage.freebsd.pl>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
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
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Apr 2006 16:33:58 -0000


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