From owner-svn-src-head@FreeBSD.ORG Tue Aug 31 19:51:33 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF887106567A; Tue, 31 Aug 2010 19:51:33 +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 5BAC78FC20; Tue, 31 Aug 2010 19:51:32 +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 o7VJpTxf034919 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 31 Aug 2010 22:51:29 +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 o7VJpTWR017603; Tue, 31 Aug 2010 22:51:29 +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 o7VJpTVg017602; Tue, 31 Aug 2010 22:51:29 +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: Tue, 31 Aug 2010 22:51:28 +0300 From: Kostik Belousov To: Dimitry Andric Message-ID: <20100831195128.GC2396@deviant.kiev.zoral.com.ua> References: <201008311811.o7VIBoC5037894@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8/DAEFlfduWObZNP" Content-Disposition: inline In-Reply-To: <201008311811.o7VIBoC5037894@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=-2.2 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_50, 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: r212064 - head/sys/boot/pc98/boot2 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Aug 2010 19:51:34 -0000 --8/DAEFlfduWObZNP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 31, 2010 at 06:11:50PM +0000, Dimitry Andric wrote: > Author: dim > Date: Tue Aug 31 18:11:50 2010 > New Revision: 212064 > URL: http://svn.freebsd.org/changeset/base/212064 >=20 > Log: > Avoid directly manipulating a NULL pointer (which could result in > undefined behaviour) in sys/boot/pc98/boot2/boot2.c. > =20 > Reviewed by: nyan > Approved by: rpaulo (mentor) >=20 > Modified: > head/sys/boot/pc98/boot2/boot2.c >=20 > Modified: head/sys/boot/pc98/boot2/boot2.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/boot/pc98/boot2/boot2.c Tue Aug 31 17:43:47 2010 (r212063) > +++ head/sys/boot/pc98/boot2/boot2.c Tue Aug 31 18:11:50 2010 (r212064) > @@ -187,9 +187,9 @@ xfsread(ino_t inode, void *buf, size_t n > static inline uint32_t > memsize(void) > { > - u_char *p =3D (u_char *)PTOV(0); > + u_char *p =3D (u_char *)PTOV(0x401); > =20 > - return *(p + 0x401) * 128 * 1024 + *(u_int16_t *)(p + 0x594) * 1024 = * 1024; > + return *p * 128 * 1024 + *(u_int16_t *)(p + (0x594 - 0x401)) * 1024 = * 1024; > } > =20 > static inline void What is the undefined behaviour you are claiming there ? Meaningful conversion from the integer type to a pointer type is implementation-defined anyway. --8/DAEFlfduWObZNP Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAkx9XUAACgkQC3+MBN1Mb4iWNQCgvUwNOSdFWnakovIflx6KAOya 2YoAoNp2tIqHBhvjmwfNh6Iy4noI0306 =3k+I -----END PGP SIGNATURE----- --8/DAEFlfduWObZNP--