From owner-svn-src-all@FreeBSD.ORG Tue Apr 17 11:55:55 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 0BAE3106564A; Tue, 17 Apr 2012 11:55:55 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx1.freebsd.org (Postfix) with ESMTP id 1414C8FC15; Tue, 17 Apr 2012 11:55:53 +0000 (UTC) Received: by lbbgm6 with SMTP id gm6so381483lbb.13 for ; Tue, 17 Apr 2012 04:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type :content-transfer-encoding; bh=iQJzSib89+Dp9sw4yZtSTh2hgTDfZ0loNAT2iWgxgN4=; b=UwP3LD0RSbdkvt6+9xJRDtJ698vTy2YADyv6m620cyTyE8O/D35xGrTF8+1Rw7wW1A 7xB5jREdv1MbyfVWxn3moRwaJyJv4E/EBIAVP/zLVLZklgOAOkn0TgG2iGhVwYzIQvp3 t+qsKsucP9DfgGkIgYiGHi26lNw1gR+hxPFPSdLkffucVFc5gtsgvlf94lOmIkczR9e1 vOnPTmeLwXkBEuR4LUq8hqvqwBw28TobHjA//KPdQJmO7qMZGcCzVIEInUBHdeEkPNne KChleJN95MZ4z63ZYFVakhiR8ZvEh3ppj52mmCK6g3U+/IXmvzJ0ODiiJ3pFChwdgCHw l5gQ== MIME-Version: 1.0 Received: by 10.112.26.10 with SMTP id h10mr6829642lbg.79.1334663752798; Tue, 17 Apr 2012 04:55:52 -0700 (PDT) Sender: pluknet@gmail.com Received: by 10.152.25.69 with HTTP; Tue, 17 Apr 2012 04:55:52 -0700 (PDT) In-Reply-To: <20120414113132.GA71196@felucia.tataz.chchile.org> References: <201203220942.q2M9gSvv017339@svn.freebsd.org> <20120414113132.GA71196@felucia.tataz.chchile.org> Date: Tue, 17 Apr 2012 15:55:52 +0400 X-Google-Sender-Auth: 5tu11rMultZFEMWFftEkO-qA3Ug Message-ID: From: Sergey Kandaurov To: Jeremie Le Hen , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: 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: Tue, 17 Apr 2012 11:55:55 -0000 On 14 April 2012 15:31, Jeremie Le Hen 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: >> =A0 Prevent fs_file NULL pointer dereference in fixfsfile() uncovered af= ter r1.5 >> =A0 when passing damaged user-supplied fstab file data. >> >> =A0 MFC after: =A01 week >> >> Modified: >> =A0 head/lib/libc/gen/fstab.c >> >> Modified: head/lib/libc/gen/fstab.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/lib/libc/gen/fstab.c Thu Mar 22 09:29:07 2012 =A0 =A0 =A0 =A0(r= 233295) >> +++ head/lib/libc/gen/fstab.c Thu Mar 22 09:42:27 2012 =A0 =A0 =A0 =A0(r= 233296) >> @@ -91,7 +91,7 @@ fixfsfile() >> =A0 =A0 =A0 struct stat sb; >> =A0 =A0 =A0 struct statfs sf; >> >> - =A0 =A0 if (strcmp(_fs_fstab.fs_file, "/") !=3D 0) >> + =A0 =A0 if (_fs_fstab.fs_file !=3D NULL &&strcmp(_fs_fstab.fs_file, "/= ") !=3D 0) >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 return; >> =A0 =A0 =A0 if (statfs("/", &sf) !=3D 0) >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 return; > > Would you mind MFC'ing this please? =A0It bit me today :). > Merged. Thanks for reminding. --=20 wbr, pluknet