From owner-svn-src-all@freebsd.org Sat May 14 23:07:27 2016 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 40FBFB3B2EC; Sat, 14 May 2016 23:07:27 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 11AEC1FF5; Sat, 14 May 2016 23:07:26 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4EN7Q7f077667; Sat, 14 May 2016 23:07:26 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4EN7QIh077666; Sat, 14 May 2016 23:07:26 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201605142307.u4EN7QIh077666@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 14 May 2016 23:07:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299771 - head/sbin/routed X-SVN-Group: head 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.22 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: Sat, 14 May 2016 23:07:27 -0000 Author: pfg Date: Sat May 14 23:07:26 2016 New Revision: 299771 URL: https://svnweb.freebsd.org/changeset/base/299771 Log: routed: Fix use after free. For the multihomed case, ifp be used after being freed. NULL the value after freeing it and avoid getting into the branch without reassigning a new value. CID: 272671 Obtained from: NetBSD MFC after: 2 weeks Modified: head/sbin/routed/if.c Modified: head/sbin/routed/if.c ============================================================================== --- head/sbin/routed/if.c Sat May 14 22:43:07 2016 (r299770) +++ head/sbin/routed/if.c Sat May 14 23:07:26 2016 (r299771) @@ -955,6 +955,7 @@ ifinit(void) (intmax_t)now.tv_sec - ifp->int_data.ts); ifdel(ifp); + ifp = NULL; } continue; } @@ -1151,7 +1152,7 @@ ifinit(void) /* If we are multi-homed, optionally advertise a route to * our main address. */ - if (advertise_mhome + if ((advertise_mhome && ifp) || (tot_interfaces > 1 && mhome && (ifp = ifwithaddr(myaddr, 0, 0)) != NULL