From owner-svn-src-head@freebsd.org Tue Apr 14 13:12:23 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5BC0B2C04EA; Tue, 14 Apr 2020 13:12:23 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 491m9g1fCNz49v9; Tue, 14 Apr 2020 13:12:23 +0000 (UTC) (envelope-from melifaro@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 33B0C5B70; Tue, 14 Apr 2020 13:12:23 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03EDCMGY066025; Tue, 14 Apr 2020 13:12:22 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03EDCMA5066023; Tue, 14 Apr 2020 13:12:22 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <202004141312.03EDCMA5066023@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Tue, 14 Apr 2020 13:12:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359917 - in head/sys: netinet netinet6 X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: in head/sys: netinet netinet6 X-SVN-Commit-Revision: 359917 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2020 13:12:23 -0000 Author: melifaro Date: Tue Apr 14 13:12:22 2020 New Revision: 359917 URL: https://svnweb.freebsd.org/changeset/base/359917 Log: Plug netmask NULL check during route addition causing kernel panic. This bug was introduced by the r359823. Reported by: hselasky Modified: head/sys/netinet/in_rmx.c head/sys/netinet6/in6_rmx.c Modified: head/sys/netinet/in_rmx.c ============================================================================== --- head/sys/netinet/in_rmx.c Tue Apr 14 10:10:31 2020 (r359916) +++ head/sys/netinet/in_rmx.c Tue Apr 14 13:12:22 2020 (r359917) @@ -103,7 +103,8 @@ rib4_preadd(u_int fibnum, const struct sockaddr *addr, /* Ensure that default route nhop has special flag */ const struct sockaddr_in *mask4 = (const struct sockaddr_in *)mask; - if ((rt_flags & RTF_HOST) == 0 && mask4->sin_addr.s_addr == 0) + if ((rt_flags & RTF_HOST) == 0 && mask4 != NULL && + mask4->sin_addr.s_addr == 0) nh->nh_flags |= NHF_DEFAULT; /* Set nhop type to basic per-AF nhop */ Modified: head/sys/netinet6/in6_rmx.c ============================================================================== --- head/sys/netinet6/in6_rmx.c Tue Apr 14 10:10:31 2020 (r359916) +++ head/sys/netinet6/in6_rmx.c Tue Apr 14 13:12:22 2020 (r359917) @@ -125,7 +125,7 @@ rib6_preadd(u_int fibnum, const struct sockaddr *addr, /* Ensure that default route nhop has special flag */ const struct sockaddr_in6 *mask6 = (const struct sockaddr_in6 *)mask; - if ((nhop_get_rtflags(nh) & RTF_HOST) == 0 && + if ((nhop_get_rtflags(nh) & RTF_HOST) == 0 && mask6 != NULL && IN6_IS_ADDR_UNSPECIFIED(&mask6->sin6_addr)) nh->nh_flags |= NHF_DEFAULT;