Date: Tue, 17 Apr 2012 15:55:52 +0400 From: Sergey Kandaurov <pluknet@freebsd.org> To: Jeremie Le Hen <jeremie@le-hen.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r233296 - head/lib/libc/gen Message-ID: <CAE-mSO%2BkdMWy-AQSzinDkEmht_ztAO8xm41xXNWojHk%2BAGOP2g@mail.gmail.com> In-Reply-To: <20120414113132.GA71196@felucia.tataz.chchile.org> References: <201203220942.q2M9gSvv017339@svn.freebsd.org> <20120414113132.GA71196@felucia.tataz.chchile.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 14 April 2012 15:31, Jeremie Le Hen <jeremie@le-hen.org> wrote: > Hi Sergey, > > On Thu, Mar 22, 2012 at 09:42:28AM +0000, Sergey Kandaurov wrote: >> Author: pluknet >> Date: Thu Mar 22 09:42:27 2012 >> New Revision: 233296 >> URL: http://svn.freebsd.org/changeset/base/233296 >> >> Log: >> Prevent fs_file NULL pointer dereference in fixfsfile() uncovered after r1.5 >> when passing damaged user-supplied fstab file data. >> >> MFC after: 1 week >> >> Modified: >> head/lib/libc/gen/fstab.c >> >> Modified: head/lib/libc/gen/fstab.c >> ============================================================================== >> --- head/lib/libc/gen/fstab.c Thu Mar 22 09:29:07 2012 (r233295) >> +++ head/lib/libc/gen/fstab.c Thu Mar 22 09:42:27 2012 (r233296) >> @@ -91,7 +91,7 @@ fixfsfile() >> struct stat sb; >> struct statfs sf; >> >> - if (strcmp(_fs_fstab.fs_file, "/") != 0) >> + if (_fs_fstab.fs_file != NULL &&strcmp(_fs_fstab.fs_file, "/") != 0) >> return; >> if (statfs("/", &sf) != 0) >> return; > > Would you mind MFC'ing this please? It bit me today :). > Merged. Thanks for reminding. -- wbr, pluknet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAE-mSO%2BkdMWy-AQSzinDkEmht_ztAO8xm41xXNWojHk%2BAGOP2g>