From owner-freebsd-net@FreeBSD.ORG  Mon Jul 11 13:40:41 2005
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
X-Original-To: freebsd-net@freebsd.org
Delivered-To: freebsd-net@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E856416A41C
	for <freebsd-net@freebsd.org>; Mon, 11 Jul 2005 13:40:41 +0000 (GMT)
	(envelope-from gnn@neville-neil.com)
Received: from mrout1-b.corp.dcn.yahoo.com (mrout1-b.corp.dcn.yahoo.com
	[216.109.112.27])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2FF6943D53
	for <freebsd-net@freebsd.org>; Mon, 11 Jul 2005 13:40:40 +0000 (GMT)
	(envelope-from gnn@neville-neil.com)
Received: from minion.local.neville-neil.com (proxy8.corp.yahoo.com
	[216.145.48.13])
	by mrout1-b.corp.dcn.yahoo.com (8.13.4/8.13.4/y.out) with ESMTP id
	j6BDeIB5064216
	for <freebsd-net@freebsd.org>; Mon, 11 Jul 2005 06:40:19 -0700 (PDT)
Date: Mon, 11 Jul 2005 22:40:21 +0900
Message-ID: <m21x65a2be.wl%gnn@neville-neil.com>
From: gnn@freebsd.org
To: freebsd-net@freebsd.org
User-Agent: Wanderlust/2.12.2 (99 Luftballons) SEMI/1.14.6 (Maruoka)
	FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/21.2
	(powerpc-apple-darwin) MULE/5.0 (SAKAKI)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Subject: Patch for routing socket bug, please review and test...
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jul 2005 13:40:42 -0000

Hi Folks,

Courtesy of OpenBSD, I have taken their changes and modified them to
fit our kernel.  Please test and let me know about this patch.

Thanks,
George

Index: rtsock.c
===================================================================
RCS file: /home/ncvs/src/sys/net/rtsock.c,v
retrieving revision 1.123
diff -u -r1.123 rtsock.c
--- rtsock.c	9 Jun 2005 12:20:50 -0000	1.123
+++ rtsock.c	11 Jul 2005 13:37:38 -0000
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.7 (Berkeley) 10/12/95
- * $FreeBSD: src/sys/net/rtsock.c,v 1.123 2005/06/09 12:20:50 harti Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
@@ -434,6 +434,25 @@
 		RT_LOCK(rt);
 		RT_ADDREF(rt);
 
+		/* 
+		 * Fix for PR: 82974
+		 *
+		 * RTM_CHANGE/LOCK need a perfect match, rn_lookup()
+		 * returns a perfect match in case a netmask is
+		 * specified.  For host routes only a longest prefix
+		 * match is returned so it is necessary to compare the
+		 * existence of the netmaks.  If both have a netmask
+		 * rnh_lookup() did a perfect match and if non of them
+		 * have a netmask both are host routes which is also a
+		 * perfect match.
+		 */
+
+		if (rtm->rtm_type != RTM_GET && 
+		    (!rt_mask(rt) != !info.rti_info[RTAX_NETMASK])) {
+			RT_UNLOCK(rt);
+			senderr(ESRCH);
+		}
+
 		switch(rtm->rtm_type) {
 
 		case RTM_GET: