From owner-svn-src-head@freebsd.org Tue Apr 14 12:24:57 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 1DAFD2BF707; Tue, 14 Apr 2020 12:24:57 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 491l6w0zVjz46tf; Tue, 14 Apr 2020 12:24:55 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2020.home.selasky.org (unknown [62.141.129.235]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 60C2A2602DF; Tue, 14 Apr 2020 14:24:47 +0200 (CEST) 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 To: "Alexander V. Chernikov" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202004121430.03CEU0lX013314@repo.freebsd.org> From: Hans Petter Selasky Message-ID: <74fe07bc-af55-ac8d-ef64-d9912fe3bd57@selasky.org> Date: Tue, 14 Apr 2020 14:23:45 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.4.2 MIME-Version: 1.0 In-Reply-To: <202004121430.03CEU0lX013314@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 491l6w0zVjz46tf X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of hps@selasky.org designates 2a01:4f8:c17:6c4b::2 as permitted sender) smtp.mailfrom=hps@selasky.org X-Spamd-Result: default: False [-4.98 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+a:mail.turbocat.net:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[selasky.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; IP_SCORE(-2.68)[ip: (-9.21), ipnet: 2a01:4f8::/29(-2.62), asn: 24940(-1.58), country: DE(-0.02)]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] 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 12:24:57 -0000 Hi, 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