From owner-svn-src-all@FreeBSD.ORG Tue Aug 31 19:40:23 2010 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 0F1ED10656B4; Tue, 31 Aug 2010 19:40:23 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id D25A48FC12; Tue, 31 Aug 2010 19:40:22 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 61AD646B66; Tue, 31 Aug 2010 15:40:22 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id CA2BF8A03C; Tue, 31 Aug 2010 15:40:09 -0400 (EDT) From: John Baldwin To: Dimitry Andric Date: Tue, 31 Aug 2010 15:37:51 -0400 User-Agent: KMail/1.13.5 (FreeBSD/7.3-CBSD-20100819; KDE/4.4.5; amd64; ; ) References: <201008311811.o7VIBoC5037894@svn.freebsd.org> In-Reply-To: <201008311811.o7VIBoC5037894@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201008311537.51825.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Tue, 31 Aug 2010 15:40:09 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx 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-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: Tue, 31 Aug 2010 19:40:23 -0000 On Tuesday, August 31, 2010 2:11:50 pm Dimitry Andric wrote: > Author: dim > Date: Tue Aug 31 18:11:50 2010 > New Revision: 212064 > URL: http://svn.freebsd.org/changeset/base/212064 > > Log: > Avoid directly manipulating a NULL pointer (which could result in > undefined behaviour) in sys/boot/pc98/boot2/boot2.c. > > Reviewed by: nyan > Approved by: rpaulo (mentor) > > Modified: > head/sys/boot/pc98/boot2/boot2.c > > Modified: head/sys/boot/pc98/boot2/boot2.c > ============================================================================== > --- 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 = (u_char *)PTOV(0); > + u_char *p = (u_char *)PTOV(0x401); > > - return *(p + 0x401) * 128 * 1024 + *(u_int16_t *)(p + 0x594) * 1024 * 1024; > + return *p * 128 * 1024 + *(u_int16_t *)(p + (0x594 - 0x401)) * 1024 * 1024; > } Perhaps replace '(p + 0x594 - 0x401)' with just 'PTOV(0x594)'? I would actually find it cleaner to remove 'p' altogether perhaps: return (*(u_char *)PTOV(0x401) * 128 * 1024 + *(uint16_t *)PTOV(0x594) * 1024 * 1024); -- John Baldwin