From owner-svn-src-stable@FreeBSD.ORG  Tue Oct 21 20:20:26 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D6187BE9;
 Tue, 21 Oct 2014 20:20:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C23CA24D;
 Tue, 21 Oct 2014 20:20:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9LKKQde069599;
 Tue, 21 Oct 2014 20:20:26 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9LKKQUb069598;
 Tue, 21 Oct 2014 20:20:26 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201410212020.s9LKKQUb069598@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 21 Oct 2014 20:20:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r273413 - stable/8/sbin/routed
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Oct 2014 20:20:27 -0000

Author: delphij
Date: Tue Oct 21 20:20:26 2014
New Revision: 273413
URL: https://svnweb.freebsd.org/changeset/base/273413

Log:
  Fix routed(8) remote denial of service vulnerability. [SA-14:21]

Modified:
  stable/8/sbin/routed/input.c

Modified: stable/8/sbin/routed/input.c
==============================================================================
--- stable/8/sbin/routed/input.c	Tue Oct 21 20:20:17 2014	(r273412)
+++ stable/8/sbin/routed/input.c	Tue Oct 21 20:20:26 2014	(r273413)
@@ -288,6 +288,10 @@ input(struct sockaddr_in *from,		/* rece
 				/* Answer a query from a utility program
 				 * with all we know.
 				 */
+				if (aifp == NULL) {
+					trace_pkt("ignore remote query");
+					return;
+				}
 				if (from->sin_port != htons(RIP_PORT)) {
 					supply(from, aifp, OUT_QUERY, 0,
 					       rip->rip_vers, ap != 0);