From owner-svn-src-all@freebsd.org Fri Dec 18 14:47:12 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2DA7A4B0A1 for ; Fri, 18 Dec 2015 14:47:12 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qg0-x22b.google.com (mail-qg0-x22b.google.com [IPv6:2607:f8b0:400d:c04::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A3E931572 for ; Fri, 18 Dec 2015 14:47:12 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qg0-x22b.google.com with SMTP id k90so55158100qge.0 for ; Fri, 18 Dec 2015 06:47:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=VScuHyEDx07Unwv/SOBcfvKpKnzdnlaCBpiDmCDRNns=; b=toOSiW5EQ99byH4aIhTfdoQJ0sffgaRfmXN3ImvoOs7ryCieGCLRpKN4jz9sOk2dHW 3zRNSoj+gzva/8klkTx53ujXWoDxKBnub+WSk3c12vZXIsqxJCKk6mDK/W3IXBgrdQgT SuSj9CpMH/L0ux45lUj68B920AlA2s66XM99EqG1GC7KKq8T29QRGaeRb/cTDjDOlZt7 MGLukno6hUgHW920++i2ZUT2r4wbw24O9cu1WrJvwt9A1kyuaVf0gDOvGjIdlk6flXIk Uwc5LkJxhDcanA/dqzjoJ6n6yN/Z57t+z7SMdUc0w/bUMrYDVnGW0Mruk/M/FGtjSIzl RBhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=VScuHyEDx07Unwv/SOBcfvKpKnzdnlaCBpiDmCDRNns=; b=iCugD4tB/t1xGf76XE/jRdunwCq4vyU13Qn2i6zyFuQjtOWIdqAOIlRnKTQApeSrL+ tD4Dxosrz41ZDQEA+hfDrJc0p4bZ7DHSK8O9Q5nw0XaHhCsCBZP8xKOrLH8eno3IGwxh S3X3/a5OyBTvR3UZj7k7dK8ovb+U/joGX04P1r5q4klx8AP0WwyG3V+HzZ3XHI4WoCG3 t5i6wq8JWJuThMr8HGHGDM0fIF+UtzPQWKcb3rkZp2SRUW+ZEqfteBfac/CgMpXvnZWu BAQoZwKfFMbFQikWBHxoU5/67xwuEKq+5q1gPVWBOAf9rUoaGIReRxQOPOmnJQ9mtiaV sSjA== X-Gm-Message-State: ALoCoQniTUSUwi1JujwjH0VfbkfGpkxPw1wkH+NFVFJlLPcDORQxPhEEJA9dgPS8g/OkjINaChZGeqSlU14bgNWAz8ZedMZMzg== X-Received: by 10.141.3.9 with SMTP id f9mr5698122qhd.98.1450450031403; Fri, 18 Dec 2015 06:47:11 -0800 (PST) Received: from mutt-hardenedbsd ([63.88.83.104]) by smtp.gmail.com with ESMTPSA id 63sm6919778qgl.31.2015.12.18.06.47.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Dec 2015 06:47:09 -0800 (PST) Date: Fri, 18 Dec 2015 09:47:08 -0500 From: Shawn Webb To: Warner Losh Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r292436 - head/sys/geom/sched Message-ID: <20151218144708.GA27589@mutt-hardenedbsd> References: <201512181410.tBIEA0FD099700@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="X1bOJ3K7DJ5YkBrT" Content-Disposition: inline In-Reply-To: <201512181410.tBIEA0FD099700@repo.freebsd.org> X-Operating-System: FreeBSD mutt-hardenedbsd 11.0-CURRENT-HBSD FreeBSD 11.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0x6A84658F52456EEE User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 18 Dec 2015 14:47:13 -0000 --X1bOJ3K7DJ5YkBrT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 18, 2015 at 02:10:00PM +0000, Warner Losh wrote: > Author: imp > Date: Fri Dec 18 14:10:00 2015 > New Revision: 292436 > URL: https://svnweb.freebsd.org/changeset/base/292436 >=20 > Log: > It turns out that it's OK to sleep in this context, so use M_WAITOK > for the softc for the delay module. > =20 > Noticed by: rpokala@ >=20 > Modified: > head/sys/geom/sched/gs_delay.c >=20 > Modified: head/sys/geom/sched/gs_delay.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/sched/gs_delay.c Fri Dec 18 11:20:50 2015 (r292435) > +++ head/sys/geom/sched/gs_delay.c Fri Dec 18 14:10:00 2015 (r292436) > @@ -201,8 +201,7 @@ g_delay_init(struct g_geom *geom) > { > struct g_delay_softc *sc; > =20 > - /* XXX check whether we can sleep */ > - sc =3D malloc(sizeof *sc, M_GEOM_SCHED, M_NOWAIT | M_ZERO); > + sc =3D malloc(sizeof *sc, M_GEOM_SCHED, M_WAITOK | M_ZERO); > sc->sc_geom =3D geom; > bioq_init(&sc->sc_bioq); > callout_init(&sc->sc_wait, CALLOUT_MPSAFE); Additionally, this fixed a potential NULL dereference bug. Thanks, --=20 Shawn Webb HardenedBSD GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE --X1bOJ3K7DJ5YkBrT Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWdBxpAAoJEGqEZY9SRW7u7zMP/RtRB+MMhXK4kkSolcWnkoiH /FYTIqHM7tOuSAnM/GANTapjE9yCNv4QqeCNucY3XNBex4r3mprRmVrX5LVm2Djo ig67b3FUaBN90ix4FBMvw3kuYVEcLzCIiHUWZ+B4FnJJEUrCDUxN26XWoC/VmFlD weCvY1CCE7rqcDI7WjGXC06AOF5oag59liPSCLvbRgTH5DIGjtf01w0vn8wXdKEM xyei8g4C5dqfCzKuhq/2QSj3uSfuTXSBcfaV9aCkwDN4n4Hb+GwtmFyAkGfAp8bD +E016sKJHfSKtSTDrIm+ZisOH0cjk7vSNnnAPBHkUgS++9eafs2FBzjQ0r+ELCpb h/MEKMBXNUBcsJZiasy6Pty/J1uLe0/M6JhG5Snf9CEICm8/bWqHkwPltHnA34YO X9794WLdqinHlr+mwNejzAsIYX6ux+pahuFXPXzAgcVx6EBZ0k0Lg8raL1zLlWT0 MbMPt1qkkCy1iJvAxzyKQUEq8Wtd+Ef4xSpqPel+Zt5kzvTjswHcyEwddDzaGOfL Sb3yyRuOoiteTAXJ10pZbiNOgdyPLO3Kky+fiNErvNTlde0AbskY665oUPDFTvCg FdapM524HHhmN7dk9pWwxG15jgfX8dknfesGLtdAFQylKqR9+LONIQTH1HBULDa5 BLGHsrOk7qAlS0p+byju =soDD -----END PGP SIGNATURE----- --X1bOJ3K7DJ5YkBrT--