From owner-svn-src-head@freebsd.org Tue Apr 14 13:15:37 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 C253C2C06A6; Tue, 14 Apr 2020 13:15:37 +0000 (UTC) (envelope-from melifaro@ipfw.ru) Received: from forward500o.mail.yandex.net (forward500o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::610]) (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 491mFN0LKlz4BC3; Tue, 14 Apr 2020 13:15:35 +0000 (UTC) (envelope-from melifaro@ipfw.ru) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward500o.mail.yandex.net (Yandex) with ESMTP id 27CA86118F; Tue, 14 Apr 2020 16:15:32 +0300 (MSK) Received: from localhost (localhost [::1]) by mxback6o.mail.yandex.net (mxback/Yandex) with ESMTP id 7Z6GY972Zl-FV3CfVd7; Tue, 14 Apr 2020 16:15:31 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfw.ru; s=mail; t=1586870131; bh=v9kZBPN3iv8NVIMLDPzcxxzEa3dt8sBwnvQqlS9kGZU=; h=Message-Id:Subject:In-Reply-To:Date:References:To:From; b=Lm9azazZqJdYXJ1TwuTDFT2kqNoMYPn1aWwuBACKDT/2vSVgIjhCnjwQqlhD1yF9t QoyneeXGWAWt0rEDUdbL0ndeWjAL7X5zK2nbB6kNUfsKBaD3OBBEQV5ywG2LG7cuhL +9PdXDtfSA+9YX8mRW6Ej7gB83Njg/F8VSXWYnVU= Received: by sas1-c7aad230fe87.qloud-c.yandex.net with HTTP; Tue, 14 Apr 2020 16:15:31 +0300 From: Alexander V. Chernikov Envelope-From: melifaro@ipfw.ru To: Hans Petter Selasky , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" In-Reply-To: <74fe07bc-af55-ac8d-ef64-d9912fe3bd57@selasky.org> References: <202004121430.03CEU0lX013314@repo.freebsd.org> <74fe07bc-af55-ac8d-ef64-d9912fe3bd57@selasky.org> Subject: Re: svn commit: r359823 - in head: etc/mtree include lib/libc/gen sys/conf sys/net sys/net/route sys/netinet sys/netinet6 sys/sys usr.bin/netstat MIME-Version: 1.0 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Tue, 14 Apr 2020 14:15:31 +0100 Message-Id: <10890571586869980@sas2-ca838ac7608b.qloud-c.yandex.net> Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=utf-8 X-Rspamd-Queue-Id: 491mFN0LKlz4BC3 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=ipfw.ru header.s=mail header.b=Lm9azazZ; dmarc=none; spf=pass (mx1.freebsd.org: domain of melifaro@ipfw.ru designates 2a02:6b8:0:1a2d::610 as permitted sender) smtp.mailfrom=melifaro@ipfw.ru X-Spamd-Result: default: False [-5.79 / 15.00]; ARC_NA(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; R_DKIM_ALLOW(-0.20)[ipfw.ru:s=mail]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2a02:6b8:0:1000::/52]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[ipfw.ru:+]; RCVD_IN_DNSWL_NONE(0.00)[0.1.6.0.0.0.0.0.0.0.0.0.0.0.0.0.d.2.a.1.0.0.0.0.8.b.6.0.2.0.a.2.list.dnswl.org : 127.0.5.0]; IP_SCORE(-3.59)[ip: (-9.37), ipnet: 2a02:6b8::/32(-4.76), asn: 13238(-3.85), country: RU(0.01)]; FORGED_SENDER(0.30)[melifaro@freebsd.org,melifaro@ipfw.ru]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13238, ipnet:2a02:6b8::/32, country:RU]; FROM_NEQ_ENVFROM(0.00)[melifaro@freebsd.org,melifaro@ipfw.ru] 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:15:37 -0000 14.04.2020, 13:25, "Hans Petter Selasky" : > Hi, Hi Hans, Thank you! Indeed, the check slipped through the cracks while merging the code. Should be fixed by r359917. I'll add the testcases to cover that later today. > > It looks like you need to add some NULL checks: > >>  diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c >>  index eeb7760c5cc..5f9ae967177 100644 >>  --- a/sys/netinet/in_rmx.c >>  +++ b/sys/netinet/in_rmx.c >>  @@ -103,7 +103,7 @@ rib4_preadd(u_int fibnum, const struct sockaddr *addr, const struct sockaddr *ma >> >>          /* 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 */ >>  diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c >>  index 7f10b290309..4621669dab9 100644 >>  --- a/sys/netinet6/in6_rmx.c >>  +++ b/sys/netinet6/in6_rmx.c >>  @@ -125,7 +125,7 @@ rib6_preadd(u_int fibnum, const struct sockaddr *addr, const struct sockaddr *ma >> >>          /* 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; > > Else I hit a panic with this command: > > sysctl net.inet.icmp.bmcastecho=1 > route add -net 255.255.255.255 a.b.c.d > > Where a.b.c.d is a valid IPv4 on the local network. > > --HPS