openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: avoid buffer overrun by using pstrcpy, not strncpy 

Also, use PATH_MAX, rather than the arbitrary 1024.
Using PATH_MAX is more consistent with other filename-related
variables in this file, like backing_filename and tmp_filename.

Acked-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jim Meyering 2012-10-04 13:09:46 +02:00 committed by Anthony Liguori
parent bfad67399b
commit c2cba3d931
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block.c
View File

@ -1506,7 +1506,7 @@ int bdrv_commit(BlockDriverState *bs)
int n, ro, open_flags; int n, ro, open_flags;
int ret = 0; int ret = 0;
uint8_t *buf; uint8_t *buf;
char filename[1024]; char filename[PATH_MAX];
if (!drv) if (!drv)
return -ENOMEDIUM; return -ENOMEDIUM;
@ -1520,7 +1520,8 @@ int bdrv_commit(BlockDriverState *bs)
} }
ro = bs->backing_hd->read_only; ro = bs->backing_hd->read_only;
strncpy(filename, bs->backing_hd->filename, sizeof(filename)); /* Use pstrcpy (not strncpy): filename must be NUL-terminated. */
pstrcpy(filename, sizeof(filename), bs->backing_hd->filename);
open_flags = bs->backing_hd->open_flags; open_flags = bs->backing_hd->open_flags;
if (ro) { if (ro) {