Date: Fri, 5 Sep 2014 12:59:12 -0700 From: Garrett Cooper <yaneurabeya@gmail.com> To: Mateusz Guzik <mjguzik@gmail.com> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, Gleb Smirnoff <glebius@FreeBSD.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r271182 - head/sys/kern Message-ID: <FF7C656B-2A15-4355-9821-7D2A29C2AF09@gmail.com> In-Reply-To: <20140905195410.GA722@dft-labs.eu> References: <201409051950.s85JoI3r000416@svn.freebsd.org> <20140905195410.GA722@dft-labs.eu>
next in thread | previous in thread | raw e-mail | index | archive | help
> On Sep 5, 2014, at 12:54, Mateusz Guzik <mjguzik@gmail.com> wrote: >=20 >> On Fri, Sep 05, 2014 at 07:50:18PM +0000, Gleb Smirnoff wrote: >> Author: glebius >> Date: Fri Sep 5 19:50:18 2014 >> New Revision: 271182 >> URL: http://svnweb.freebsd.org/changeset/base/271182 >>=20 >> Log: >> Set vnet context before accessing V_socket_hhh[]. >>=20 >> Submitted by: "Hiroo Ono (=1B$B>.Ln42@8=1B(B)" <hiroo.ono+freebsd gma= il.com> >>=20 >> Modified: >> head/sys/kern/uipc_socket.c >>=20 >> Modified: head/sys/kern/uipc_socket.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=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D >> --- head/sys/kern/uipc_socket.c Fri Sep 5 19:00:30 2014 (r271181) >> +++ head/sys/kern/uipc_socket.c Fri Sep 5 19:50:18 2014 (r271182) >> @@ -3265,9 +3265,11 @@ filt_soread(struct knote *kn, long hint) >> return 1; >> } >>=20 >> + CURVNET_SET(so->so_vnet); >> if (V_socket_hhh[HHOOK_FILT_SOREAD]->hhh_nhooks > 0) >> /* This hook returning non-zero indicates an event, not error */ >> return (hhook_run_socket(so, NULL, HHOOK_FILT_SOREAD)); >> + CURVNET_RESTORE(); >=20 > should not this be something like: > error =3D hhook_run_socket(so, NULL, HHOOK_FILT_SOREAD); > CURVNET_RESTORE(); > return (error); > ? Probably :/.. >> return (0); >> } >> @@ -3294,8 +3296,10 @@ filt_sowrite(struct knote *kn, long hint >> SOCKBUF_LOCK_ASSERT(&so->so_snd); >> kn->kn_data =3D sbspace(&so->so_snd); >>=20 >> + CURVNET_SET(so->so_vnet); >> if (V_socket_hhh[HHOOK_FILT_SOWRITE]->hhh_nhooks > 0) >> hhook_run_socket(so, kn, HHOOK_FILT_SOWRITE); >> + CURVNET_RESTORE(); >>=20 >> if (so->so_snd.sb_state & SBS_CANTSENDMORE) { >> kn->kn_flags |=3D EV_EOF; >=20 > --=20 > Mateusz Guzik <mjguzik gmail.com> >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?FF7C656B-2A15-4355-9821-7D2A29C2AF09>