From owner-svn-src-all@freebsd.org Wed Jan 22 21:21:01 2020 Return-Path: Delivered-To: svn-src-all@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 497781FE11C; Wed, 22 Jan 2020 21:21:01 +0000 (UTC) (envelope-from Michael.Tuexen@macmic.franken.de) Received: from drew.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 482yxn1FjFz4YQc; Wed, 22 Jan 2020 21:21:00 +0000 (UTC) (envelope-from Michael.Tuexen@macmic.franken.de) Received: from [IPv6:2a02:8109:1140:c3d:1100:835:6fed:d688] (unknown [IPv6:2a02:8109:1140:c3d:1100:835:6fed:d688]) (Authenticated sender: macmic) by mail-n.franken.de (Postfix) with ESMTPSA id 23B09721E281E; Wed, 22 Jan 2020 22:20:56 +0100 (CET) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3608.40.2.2.4\)) Subject: Re: svn commit: r356989 - head/sys/netinet From: Michael Tuexen In-Reply-To: <202001221719.00MHJrvq033961@repo.freebsd.org> Date: Wed, 22 Jan 2020 22:20:55 +0100 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <202001221719.00MHJrvq033961@repo.freebsd.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.3608.40.2.2.4) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 482yxn1FjFz4YQc X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jan 2020 21:21:01 -0000 > On 22. Jan 2020, at 18:19, Gleb Smirnoff 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 *