Date: Wed, 22 Jan 2020 22:20:55 +0100 From: Michael Tuexen <Michael.Tuexen@macmic.franken.de> To: Gleb Smirnoff <glebius@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r356989 - head/sys/netinet Message-ID: <E9B1BDEF-59BD-43E6-A056-C9E9C2D2543C@macmic.franken.de> In-Reply-To: <202001221719.00MHJrvq033961@repo.freebsd.org> References: <202001221719.00MHJrvq033961@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 22. Jan 2020, at 18:19, Gleb Smirnoff <glebius@FreeBSD.org> wrote: >=20 > Author: glebius > Date: Wed Jan 22 17:19:53 2020 > New Revision: 356989 > URL: https://svnweb.freebsd.org/changeset/base/356989 >=20 > Log: > Plug possible calls into ip6?_output() without network epoch from = SCTP > bluntly adding epoch entrance into the macro that SCTP uses to call > ip6?_output(). This definitely will introduce several epoch = recursions. Can you specify under which condition NET_EPOCH_ENTER() should be = called? Then I can try to figure out where these calls need to be made in the SCTP code. Best regards Michael >=20 > Reported by: = https://syzkaller.appspot.com/bug?id=3D79f03f574594a5be464997310896765c458= ed80a > Reported by: = https://syzkaller.appspot.com/bug?id=3D07c6f52106cddbe356cc2b2f3664a1c51cc= 0dadf >=20 > Modified: > head/sys/netinet/sctp_os_bsd.h >=20 > Modified: head/sys/netinet/sctp_os_bsd.h > = =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=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/netinet/sctp_os_bsd.h Wed Jan 22 17:06:55 2020 = (r356988) > +++ head/sys/netinet/sctp_os_bsd.h Wed Jan 22 17:19:53 2020 = (r356989) > @@ -412,6 +412,7 @@ typedef struct rtentry sctp_rtentry_t; > */ > #define SCTP_IP_OUTPUT(result, o_pak, ro, stcb, vrf_id) \ > { \ > + struct epoch_tracker et; \ > int o_flgs =3D IP_RAWOUTPUT; \ > struct sctp_tcb *local_stcb =3D stcb; \ > if (local_stcb && \ > @@ -419,19 +420,24 @@ typedef struct rtentry sctp_rtentry_t; > local_stcb->sctp_ep->sctp_socket) \ > o_flgs |=3D local_stcb->sctp_ep->sctp_socket->so_options = & SO_DONTROUTE; \ > m_clrprotoflags(o_pak); \ > + NET_EPOCH_ENTER(et); \ > result =3D ip_output(o_pak, NULL, ro, o_flgs, 0, NULL); \ > + NET_EPOCH_EXIT(et); \ > } >=20 > #define SCTP_IP6_OUTPUT(result, o_pak, ro, ifp, stcb, vrf_id) \ > { \ > + struct epoch_tracker et; \ > struct sctp_tcb *local_stcb =3D stcb; \ > m_clrprotoflags(o_pak); \ > + NET_EPOCH_ENTER(et); \ > if (local_stcb && local_stcb->sctp_ep) \ > result =3D ip6_output(o_pak, \ > ((struct inpcb = *)(local_stcb->sctp_ep))->in6p_outputopts, \ > (ro), 0, 0, ifp, NULL); \ > else \ > result =3D ip6_output(o_pak, NULL, (ro), 0, 0, ifp, = NULL); \ > + NET_EPOCH_EXIT(et); \ > } >=20 > struct mbuf *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E9B1BDEF-59BD-43E6-A056-C9E9C2D2543C>