Signed-off-by: Matthew Daley <mattd@bugfuzz.com>
---
tools/memshr/shm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/memshr/shm.c b/tools/memshr/shm.c
index c925cf2..30975dc 100644
--- a/tools/memshr/shm.c
+++ b/tools/memshr/shm.c
@@ -217,9 +217,9 @@ uint16_t shm_vbd_image_get(const char* file,
vbd_image_info_t *vbd_imgs)
DPRINTF("No space in vbds table.\n");
return 0;
}
- if(strlen(file) > MAX_NAME_LEN)
+ if(strlen(file) > MAX_NAME_LEN - 1)
{
- DPRINTF("Filename: %s too long (>%d).\n", file,
MAX_NAME_LEN);
+ DPRINTF("Filename: %s too long (>%d).\n", file,
MAX_NAME_LEN - 1);
return 0;
}
/* Init the entry */
--
1.7.10.4
Ian Campbell
2013-Nov-29 10:35 UTC
Re: [PATCH] memshr: fix off-by-one in filename size check
On Thu, 2013-11-28 at 23:17 +1300, Matthew Daley wrote:> Signed-off-by: Matthew Daley <mattd@bugfuzz.com>Acked + applied, thanks. Andres -- should you have an entry in MAINTAINERS for this code?> --- > tools/memshr/shm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/memshr/shm.c b/tools/memshr/shm.c > index c925cf2..30975dc 100644 > --- a/tools/memshr/shm.c > +++ b/tools/memshr/shm.c > @@ -217,9 +217,9 @@ uint16_t shm_vbd_image_get(const char* file, vbd_image_info_t *vbd_imgs) > DPRINTF("No space in vbds table.\n"); > return 0; > } > - if(strlen(file) > MAX_NAME_LEN) > + if(strlen(file) > MAX_NAME_LEN - 1) > { > - DPRINTF("Filename: %s too long (>%d).\n", file, MAX_NAME_LEN); > + DPRINTF("Filename: %s too long (>%d).\n", file, MAX_NAME_LEN - 1); > return 0; > } > /* Init the entry */
Andres Lagar-Cavilla
2013-Nov-29 15:17 UTC
Re: [PATCH] memshr: fix off-by-one in filename size check
On Nov 29, 2013, at 5:35 AM, Ian Campbell <Ian.Campbell@citrix.com> wrote:> On Thu, 2013-11-28 at 23:17 +1300, Matthew Daley wrote: >> Signed-off-by: Matthew Daley <mattd@bugfuzz.com> > > Acked + applied, thanks. > > Andres -- should you have an entry in MAINTAINERS for this code?I manipulated memshr as a side-effect of hypervisor/x86/mem_sharing. It''s not my "baby" per se. I think it''d be more appropriate for me to maintain hypervisor/x86/mem_sharing, and if so, I can take a stab at tools/memshr as well. Of course, that discussion would involve Tim D (cc) and possibly others. Thanks Andres> >> --- >> tools/memshr/shm.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/tools/memshr/shm.c b/tools/memshr/shm.c >> index c925cf2..30975dc 100644 >> --- a/tools/memshr/shm.c >> +++ b/tools/memshr/shm.c >> @@ -217,9 +217,9 @@ uint16_t shm_vbd_image_get(const char* file, vbd_image_info_t *vbd_imgs) >> DPRINTF("No space in vbds table.\n"); >> return 0; >> } >> - if(strlen(file) > MAX_NAME_LEN) >> + if(strlen(file) > MAX_NAME_LEN - 1) >> { >> - DPRINTF("Filename: %s too long (>%d).\n", file, MAX_NAME_LEN); >> + DPRINTF("Filename: %s too long (>%d).\n", file, MAX_NAME_LEN - 1); >> return 0; >> } >> /* Init the entry */ > >
Ian Campbell
2013-Nov-29 15:46 UTC
Re: [PATCH] memshr: fix off-by-one in filename size check
On Fri, 2013-11-29 at 10:17 -0500, Andres Lagar-Cavilla wrote:> On Nov 29, 2013, at 5:35 AM, Ian Campbell <Ian.Campbell@citrix.com> wrote: > > > On Thu, 2013-11-28 at 23:17 +1300, Matthew Daley wrote: > >> Signed-off-by: Matthew Daley <mattd@bugfuzz.com> > > > > Acked + applied, thanks. > > > > Andres -- should you have an entry in MAINTAINERS for this code? > I manipulated memshr as a side-effect of hypervisor/x86/mem_sharing. It''s not my "baby" per se. > > I think it''d be more appropriate for me to maintain hypervisor/x86/mem_sharing, and if so, I can take a stab at tools/memshr as well. > > Of course, that discussion would involve Tim D (cc) and possibly others.The best way to kick it off would be with a patch to MAINTAINERS I think. Ian.