From owner-svn-src-all@FreeBSD.ORG Sat Apr 14 11:31:44 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0D2311065670; Sat, 14 Apr 2012 11:31:44 +0000 (UTC) (envelope-from jeremie@le-hen.org) Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [IPv6:2a01:e0c:1:1599::14]) by mx1.freebsd.org (Postfix) with ESMTP id 94B6B8FC19; Sat, 14 Apr 2012 11:31:39 +0000 (UTC) Received: from endor.tataz.chchile.org (unknown [82.233.239.98]) by smtp5-g21.free.fr (Postfix) with ESMTP id B21D8D48101; Sat, 14 Apr 2012 13:31:33 +0200 (CEST) Received: from felucia.tataz.chchile.org (felucia.tataz.chchile.org [192.168.1.9]) by endor.tataz.chchile.org (Postfix) with ESMTP id 92945952; Sat, 14 Apr 2012 13:31:32 +0200 (CEST) Received: by felucia.tataz.chchile.org (Postfix, from userid 1000) id 8598D647E; Sat, 14 Apr 2012 11:31:32 +0000 (UTC) Date: Sat, 14 Apr 2012 13:31:32 +0200 From: Jeremie Le Hen To: Sergey Kandaurov Message-ID: <20120414113132.GA71196@felucia.tataz.chchile.org> Mail-Followup-To: Sergey Kandaurov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201203220942.q2M9gSvv017339@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201203220942.q2M9gSvv017339@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r233296 - head/lib/libc/gen 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: Sat, 14 Apr 2012 11:31:44 -0000 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 :). Thanks. -- Jeremie Le Hen Men are born free and equal. Later on, they're on their own. Jean Yanne