svn commit: r233296 - head/lib/libc/gen

[Sergey Kandaurov]

On 14 April 2012 15:31, Jeremie Le Hen <jeremie at 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 :).
>
> Thanks.

Ah, sure. I will today.
[I was AFK for some time, and now I'm here again.]

-- 
wbr,
pluknet