xfs
[Top] [All Lists]

Re: [PATCH 1/3] xfs_fsr: ensure the line we read from leftofffile is nul

To: Brian Foster <bfoster@xxxxxxxxxx>
Subject: Re: [PATCH 1/3] xfs_fsr: ensure the line we read from leftofffile is null terminated
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Mon, 09 Jun 2014 09:01:22 -0500
Cc: Eric Sandeen <sandeen@xxxxxxxxxx>, xfs-oss <xfs@xxxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <20140609130235.GA31319@xxxxxxxxxxxxxxx>
References: <53922B49.1050005@xxxxxxxxxx> <53922C8E.3050700@xxxxxxxxxxx> <20140609130235.GA31319@xxxxxxxxxxxxxxx>
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:24.0) Gecko/20100101 Thunderbird/24.5.0
On 6/9/14, 8:02 AM, Brian Foster wrote:
> On Fri, Jun 06, 2014 at 04:03:10PM -0500, Eric Sandeen wrote:
>> Ensure that the string we read from leftofffile is NULL
>> terminated; the buffer gets passed to strchr(), so
>> it's important that we ensure it ends with NULL.
>>
>> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
>> ---
>>
>> diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
>> index 3818f02..94d235c 100644
>> --- a/fsr/xfs_fsr.c
>> +++ b/fsr/xfs_fsr.c
>> @@ -554,6 +554,8 @@ fsrallfs(char *mtab, int howlong, char *leftofffile)
>>                      fsrprintf(_("could not read %s, starting with %s\n"),
>>                              leftofffile, *fs->dev);
>>              } else {
>> +                    /* Ensure the buffer we read is null terminated */
>> +                    buf[SMBUFSZ-1] = '\0';
> 
> Maybe just initialize the buffer..?

and then read no more than SMBUFSZ-1... I dunno, 6 one way, half a dozen
the other?

-Eric

> Brian
> 
>>                      for (fs = fsbase; fs < fsend; fs++) {
>>                              fsname = fs->dev;
>>                              if ((strncmp(buf,fsname,strlen(fsname)) == 0)
>>
>> _______________________________________________
>> xfs mailing list
>> xfs@xxxxxxxxxxx
>> http://oss.sgi.com/mailman/listinfo/xfs
> 

<Prev in Thread] Current Thread [Next in Thread>