svn commit: r335919 - head/sys/netinet6

[Cy Schubert]

In message <13fa004f-6d8a-025e-9d4f-957f081113b4 at yandex.ru>, "Andrey V. 
Elsukov
" writes:
> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
> --DYq4DERiQq8E3pDWhQQJu3pRxNkEa3XRw
> Content-Type: multipart/mixed; boundary="3UyYmNTJPMJYH4JeWdQTZY41T0JnKZ9UW";
>  protected-headers="v1"
> From: "Andrey V. Elsukov" <bu7cher at yandex.ru>
> To: Cy Schubert <Cy.Schubert at cschubert.com>, Matt Macy <mmacy at FreeBSD.org>
> Cc: src-committers at freebsd.org, svn-src-all at freebsd.org,
>  svn-src-head at freebsd.org
> Message-ID: <13fa004f-6d8a-025e-9d4f-957f081113b4 at yandex.ru>
> Subject: Re: svn commit: r335919 - head/sys/netinet6
> References: <201807041305.w64D5qiK002898 at slippy.cwsent.com>
> In-Reply-To: <201807041305.w64D5qiK002898 at slippy.cwsent.com>
>
> --3UyYmNTJPMJYH4JeWdQTZY41T0JnKZ9UW
> Content-Type: text/plain; charset=utf-8
> Content-Language: en-US
> Content-Transfer-Encoding: quoted-printable
>
> On 04.07.2018 16:05, Cy Schubert wrote:
> > Hi Matt,
> >=20
> > This is causing a panic of my gateway machine. Likely due to router=20
> > solicitations.
>
> Hi,
>
> probably in the last two chunks "inp" should be replaced with "last"
>
> Index: udp6_usrreq.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- udp6_usrreq.c	(revision 335934)
> +++ udp6_usrreq.c	(working copy)
> @@ -387,7 +387,7 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
>  				if ((n =3D m_copym(m, 0, M_COPYALL, M_NOWAIT)) 
> !=3D
>  				    NULL) {
>  					INP_RLOCK(last);
> -					if (__predict_true(inp->inp_flags2 & IN
> P_FREED) =3D=3D 0) {
> +					if (__predict_true(last->inp_flags2 & I
> NP_FREED) =3D=3D 0) {
>  						UDP_PROBE(receive, NULL, last, 
> ip6,
>  					        last, uh);
>  						if (udp6_append(last, n, off, f
> romsa))
> @@ -421,7 +421,7 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
>  			goto badheadlocked;
>  		}
>  		INP_RLOCK(last);
> -		if (__predict_true(inp->inp_flags2 & INP_FREED) =3D=3D 0) {
> +		if (__predict_true(last->inp_flags2 & INP_FREED) =3D=3D 0) {
>  			UDP_PROBE(receive, NULL, last, ip6, last, uh);
>  			if (udp6_append(last, m, off, fromsa) =3D=3D 0)
>  				INP_RUNLOCK(last);
>
>
> --=20
> WBR, Andrey V. Elsukov

Makes sense. Gave it a spin before heading off to $JOB. No more panic 
loop. Thanks.


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.