From owner-svn-src-all@FreeBSD.ORG Thu Oct 23 12:50:07 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 77167251; Thu, 23 Oct 2014 12:50:07 +0000 (UTC) Received: from mail.made4.biz (mail.made4.biz [IPv6:2001:41d0:2:c018::1:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 36EC0FC0; Thu, 23 Oct 2014 12:50:07 +0000 (UTC) Received: from 2a02-8428-011b-e000-0290-f5ff-fe9d-b78c.rev.sfr.net ([2a02:8428:11b:e000:290:f5ff:fe9d:b78c] helo=magellan.dumbbell.fr) by mail.made4.biz with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.84 (FreeBSD)) (envelope-from ) id 1XhHq9-000DS1-6e; Thu, 23 Oct 2014 14:50:05 +0200 Message-ID: <5448F973.8050102@FreeBSD.org> Date: Thu, 23 Oct 2014 14:49:55 +0200 From: =?UTF-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.1.2 MIME-Version: 1.0 To: svn-src-all@freebsd.org, Colin Percival Subject: Re: svn commit: r273487 - head/sys/kern References: <201410222335.s9MNZW62045167@svn.freebsd.org> In-Reply-To: <201410222335.s9MNZW62045167@svn.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="5siMQmWpgiEsfB9Vd6lr0NHwUw6hjAWRB" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Thu, 23 Oct 2014 12:50:07 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --5siMQmWpgiEsfB9Vd6lr0NHwUw6hjAWRB Content-Type: multipart/mixed; boundary="------------080404040809030003020701" This is a multi-part message in MIME format. --------------080404040809030003020701 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi! The following change triggers a kernel trap 12 when env is NULL: > @@ -260,8 +262,10 @@ void > freeenv(char *env) > { > =20 > - if (dynamic_kenv) > + if (dynamic_kenv) { > + memset(env, 0, strlen(env)); > free(env, M_KENV); > + } > } This happens very early in boot for me, just after the lines: WARNING: WITNESS option enabled, expect reduced performance. VT: running with driver "vga". The attached simple patch fixes the problem. What I don't know is if the same problem can occur in kern_unsetenv(): > @@ -437,6 +441,7 @@ kern_unsetenv(const char *name) > kenvp[i++] =3D kenvp[j]; > kenvp[i] =3D NULL; > mtx_unlock(&kenv_lock); > + memset(oldenv, 0, strlen(oldenv)); > free(oldenv, M_KENV); > return (0); > } --=20 Jean-S=C3=A9bastien P=C3=A9dron --------------080404040809030003020701 Content-Type: text/x-patch; name="kern_freeenv-trap12.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="kern_freeenv-trap12.patch" Index: sys/kern/kern_environment.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 --- sys/kern/kern_environment.c (revision 273540) +++ sys/kern/kern_environment.c (working copy) @@ -262,7 +262,7 @@ freeenv(char *env) { =20 - if (dynamic_kenv) { + if (dynamic_kenv && env !=3D NULL) { memset(env, 0, strlen(env)); free(env, M_KENV); } --------------080404040809030003020701-- --5siMQmWpgiEsfB9Vd6lr0NHwUw6hjAWRB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJUSPl9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NzA4N0ZEMUFFQUUwRTEyREJDNkE2RjAz OUU5OTc2MUE1RkQ5NENDAAoJEDnpl2Gl/ZTMz2UP/jGE7gokzqLfafFummHJ/FJd tmWOsL5T84kY+rrPw8WfLo5gTH962WqIRTEXivKoxFEAV442gAfYyrd+/HYvXStf 3NKMx2LLuTAjNcfx17EkJgh3zk96+OR9NvrZQvXYV0XyOAIKgOuUjR3PNrr26WCa KSg80lOrlA52WdE3spuv5V/mXiaFUIydAZE4/fkCE1x928Ta3k0J5Jo73aqQOmG/ dQTljh2ClqOZ6mOmL9pzsJJGRc4G/EkgzqjdqZQE7nXJMZIgIKjpfRGDCaHt6uGO EmhSh2e/o1V0RedFT4Wy2uzpenYQJXkM1K7kwK4p8bX8Swz9yumigkUQltgLWxlD +6Bi1VU6BnLqzsHUXerMOPQQWCy0McbyQqj+B6rtsG/whkgPq2b5IvmMw8F137FW xVPczD/aF3h3/uAKI9wKeAoSAWtU1M2zQimFGFKgpGsG3Xr6FWxjdPOhA8QsLHng Vb28Vkel0DrHisfxEcJ4Tf1Nyy2is+slzNgkwUZgqPlKwJRE69kFmSVJFtSbaFtp Ey8xK1BsbrertlkLlQ0HwhJobmk9Q9UjXte5L1hwk/ZJZ1qxainQm7bPcPlvJTw8 dzJdm+m9yYJAGE1H4Z/Q0RCoZzQYId/w4AbWymzVM1qs2rHtEgxfV9g0mGwINrhR WHsOVrEjMdad906WlMqR =wQkS -----END PGP SIGNATURE----- --5siMQmWpgiEsfB9Vd6lr0NHwUw6hjAWRB--