xfs
[Top] [All Lists]

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

To: Eric Sandeen <sandeen@xxxxxxxxxxx>
Subject: Re: [PATCH 1/3] xfs_fsr: ensure the line we read from leftofffile is null terminated
From: Mark Tinguely <tinguely@xxxxxxx>
Date: Mon, 09 Jun 2014 09:29:30 -0500
Cc: Brian Foster <bfoster@xxxxxxxxxx>, Eric Sandeen <sandeen@xxxxxxxxxx>, xfs-oss <xfs@xxxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <5395BE32.3080204@xxxxxxxxxxx>
References: <53922B49.1050005@xxxxxxxxxx> <53922C8E.3050700@xxxxxxxxxxx> <20140609130235.GA31319@xxxxxxxxxxxxxxx> <5395BE32.3080204@xxxxxxxxxxx>
User-agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:9.0) Gecko/20120122 Thunderbird/9.0
On 06/09/14 09:01, Eric Sandeen wrote:
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?

I like my bike shed pained red with white and blue swirlies. :)

The strings should be NULL terminated for the string ops. It makes more sense to NULL one byte than 1024. If the full SMBUFSZ bytes are desired, then bump the array for the NULL byte.

--Mark.

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