From owner-svn-src-all@FreeBSD.ORG Sun Mar 27 20:08:09 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CA86106564A; Sun, 27 Mar 2011 20:08:09 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 93CB28FC16; Sun, 27 Mar 2011 20:08:08 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p2RK848E027769 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 27 Mar 2011 23:08:04 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id p2RK84Yp068527; Sun, 27 Mar 2011 23:08:04 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id p2RK84cO068526; Sun, 27 Mar 2011 23:08:04 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 27 Mar 2011 23:08:04 +0300 From: Kostik Belousov To: Mikolaj Golub Message-ID: <20110327200804.GM78089@deviant.kiev.zoral.com.ua> References: <201103271956.p2RJutha067490@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Jps4F43PgwelbvkV" Content-Disposition: inline In-Reply-To: <201103271956.p2RJutha067490@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r220062 - head/sys/geom/gate X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sun, 27 Mar 2011 20:08:09 -0000 --Jps4F43PgwelbvkV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Mar 27, 2011 at 07:56:55PM +0000, Mikolaj Golub wrote: > Author: trociny > Date: Sun Mar 27 19:56:55 2011 > New Revision: 220062 > URL: http://svn.freebsd.org/changeset/base/220062 >=20 > Log: > In g_gate_create() there is a window between when g_gate_softc is > registered in g_gate_units array and when its sc_provider field is > filled. If during this period g_gate_units is accessed by another > thread that is checking for provider name collision the crash is > possible. > =20 > Fix this by adding sc_name field to struct g_gate_softc. In > g_gate_create() when g_gate_softc is created but sc_provider is still > not sc_name points to provider name stored in the local array. > =20 > Approved by: pjd (mentor) > Reported by: Freddie Cash > MFC after: 1 week >=20 > Modified: > head/sys/geom/gate/g_gate.c > head/sys/geom/gate/g_gate.h >=20 > Modified: head/sys/geom/gate/g_gate.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/geom/gate/g_gate.c Sun Mar 27 19:29:18 2011 (r220061) > +++ head/sys/geom/gate/g_gate.c Sun Mar 27 19:56:55 2011 (r220062) > @@ -409,13 +409,14 @@ g_gate_create(struct g_gate_ctl_create * > for (unit =3D 0; unit < g_gate_maxunits; unit++) { > if (g_gate_units[unit] =3D=3D NULL) > continue; > - if (strcmp(name, g_gate_units[unit]->sc_provider->name) !=3D 0) > + if (strcmp(name, g_gate_units[unit]->sc_name) !=3D 0) > continue; > mtx_unlock(&g_gate_units_lock); > mtx_destroy(&sc->sc_queue_mtx); > free(sc, M_GATE); > return (EEXIST); > } > + sc->sc_name =3D name; > g_gate_units[sc->sc_unit] =3D sc; > g_gate_nunits++; > mtx_unlock(&g_gate_units_lock); > @@ -434,6 +435,9 @@ g_gate_create(struct g_gate_ctl_create * > sc->sc_provider =3D pp; > g_error_provider(pp, 0); > g_topology_unlock(); > + mtx_lock(&g_gate_units_lock); > + sc->sc_name =3D sc->sc_provider->name; > + mtx_unlock(&g_gate_units_lock); I think you do not need a mutex locked around the single assignment. As I understand, sc_provider->name is constant ? --Jps4F43PgwelbvkV Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAk2PmSMACgkQC3+MBN1Mb4h/QgCgj0A2+WWl8o01tgozAZqHh7Rn wnIAn0FB2V8Netfa/TelAUxmZ7UhjBHl =K3f0 -----END PGP SIGNATURE----- --Jps4F43PgwelbvkV--