From owner-svn-src-all@freebsd.org Wed Aug 5 22:05:26 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9863C9B4896; Wed, 5 Aug 2015 22:05:26 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.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 2D2181E9B; Wed, 5 Aug 2015 22:05:26 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t75M5PuZ063608; Wed, 5 Aug 2015 22:05:25 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t75M5PxG063604; Wed, 5 Aug 2015 22:05:25 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201508052205.t75M5PxG063604@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 5 Aug 2015 22:05:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286352 - in releng/9.3: . sbin/routed sys/conf X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Aug 2015 22:05:26 -0000 Author: delphij Date: Wed Aug 5 22:05:24 2015 New Revision: 286352 URL: https://svnweb.freebsd.org/changeset/base/286352 Log: Fix routed remote denial of service vulnerability. [SA-15:19] Approved by: so Modified: releng/9.3/UPDATING releng/9.3/sbin/routed/input.c releng/9.3/sys/conf/newvers.sh Modified: releng/9.3/UPDATING ============================================================================== --- releng/9.3/UPDATING Wed Aug 5 22:05:18 2015 (r286351) +++ releng/9.3/UPDATING Wed Aug 5 22:05:24 2015 (r286352) @@ -11,6 +11,10 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20150805: p22 FreeBSD-SA-15:19.routed + + Fix routed remote denial of service vulnerability. + 20150728: p21 FreeBSD-SA-15:15.tcp FreeBSD-SA-15:16.openssh FreeBSD-SA-15:17.bind Modified: releng/9.3/sbin/routed/input.c ============================================================================== --- releng/9.3/sbin/routed/input.c Wed Aug 5 22:05:18 2015 (r286351) +++ releng/9.3/sbin/routed/input.c Wed Aug 5 22:05:24 2015 (r286352) @@ -160,6 +160,12 @@ input(struct sockaddr_in *from, /* rece trace_rip("Recv", "from", from, sifp, rip, cc); + if (sifp == 0) { + trace_pkt(" discard a request from an indirect router" + " (possibly an attack)"); + return; + } + if (rip->rip_vers == 0) { msglim(&bad_router, FROM_NADDR, "RIP version 0, cmd %d, packet received from %s", Modified: releng/9.3/sys/conf/newvers.sh ============================================================================== --- releng/9.3/sys/conf/newvers.sh Wed Aug 5 22:05:18 2015 (r286351) +++ releng/9.3/sys/conf/newvers.sh Wed Aug 5 22:05:24 2015 (r286352) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.3" -BRANCH="RELEASE-p21" +BRANCH="RELEASE-p22" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi