From owner-svn-src-stable@FreeBSD.ORG Sun Nov 18 07:08:56 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C8EAD3D7; Sun, 18 Nov 2012 07:08:56 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) by mx1.freebsd.org (Postfix) with ESMTP id 467E08FC08; Sun, 18 Nov 2012 07:08:56 +0000 (UTC) Received: from tom.home (localhost [127.0.0.1]) by kib.kiev.ua (8.14.5/8.14.5) with ESMTP id qAI78la8033279; Sun, 18 Nov 2012 09:08:47 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.7.1 kib.kiev.ua qAI78la8033279 Received: (from kostik@localhost) by tom.home (8.14.5/8.14.5/Submit) id qAI78l2T033278; Sun, 18 Nov 2012 09:08:47 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 18 Nov 2012 09:08:47 +0200 From: Konstantin Belousov To: Eitan Adler Subject: Re: svn commit: r243210 - stable/9/usr.sbin/ndiscvt Message-ID: <20121118070847.GF73505@kib.kiev.ua> References: <201211180621.qAI6LkxT068557@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="c2/+NrNR1GxQl8IM" Content-Disposition: inline In-Reply-To: <201211180621.qAI6LkxT068557@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=0.2 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Nov 2012 07:08:56 -0000 --c2/+NrNR1GxQl8IM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Nov 18, 2012 at 06:21:46AM +0000, Eitan Adler wrote: > Author: eadler > Date: Sun Nov 18 06:21:45 2012 > New Revision: 243210 > URL: http://svnweb.freebsd.org/changeset/base/243210 >=20 > Log: > MFC r243074: > Add a missing check for fread > =20 > Approved by: cperciva (implicit) >=20 > Modified: > stable/9/usr.sbin/ndiscvt/ndiscvt.c > Directory Properties: > stable/9/usr.sbin/ndiscvt/ (props changed) >=20 > Modified: stable/9/usr.sbin/ndiscvt/ndiscvt.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 > --- stable/9/usr.sbin/ndiscvt/ndiscvt.c Sun Nov 18 05:19:08 2012 (r243209) > +++ stable/9/usr.sbin/ndiscvt/ndiscvt.c Sun Nov 18 06:21:45 2012 (r243210) > @@ -325,6 +325,8 @@ main(int argc, char *argv[]) > rewind (fp); > img =3D calloc(fsize, 1); > n =3D fread (img, fsize, 1, fp); > + if (n =3D=3D 0) > + err(1, "reading .SYS file '%s' failed", sysfile); > =20 AFAIR fread(3) can return 0 both for error and EOF. In the later case, errno is meaningless. Is the short read case fatal ? --c2/+NrNR1GxQl8IM Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQIcBAEBAgAGBQJQqIl/AAoJEJDCuSvBvK1BNisP/iLBDmFpziiVTU8dGl+cSQ5J VV7XKVr5Njf157JMbE8oFoylc1xGosj3pEJDi4KAnjsRwT244AaMqexeN5WyJ1Gx tL2xr+cM/oz8VGUnhdgVf+fZOg04o4l2nxMNDCI5y5GMrHMuO4nvJ9kZ81rO2JX8 ZH11HdHcbT/IVVHfEl90e+XRpqF0O8i1mf2HB9TOHQJolRLJqF/XUE+PAvqS5rQb E+xGTeOgw3dbUgkY8Jteg0T6iDSLaxmHBfkVkOCKQWfVjfIAWJ35tg5SYMIVzy7q Wjwo9PmNm8N8RKP9VTf3GupbHXU2C1fjWtcNNjLuj5aLm++EQpMp66mS3/eZCGkU ZfwVjVCd37Oq0jHmYrtFm0MVg3ZuiU7xaqtCJnDn8d8vmoh5mqhxzCjslcitiQ4V 7hizRE8gXF8npj4RiYo7DeeKV03Vh0XTIZq5UHzv6P0ldHLQq6X6yZT+GWDk202s iqu5eK6Drsd8YcKyBAfvsxj1hs6KWEbhbkuIL7jLhRGDwuER1iEKR1bL1M26ssmy 0aWrWa7TzSTXYgP221hQjQfQEK7MTJSCjGSnlzHj00rjfh+mXvXDN4u2IWwnYup+ UaFTafyLG3njNrKK2GyTWTiG/27yVs9aq3nIbqPEj+qooT18s1boinT/ED8Sz8bD EWvREYpCvfmtIuhZ/z1S =gwVz -----END PGP SIGNATURE----- --c2/+NrNR1GxQl8IM--