[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/22] block: avoid buffer overrun by using pstrcpy,
From: |
Jim Meyering |
Subject: |
[Qemu-devel] [PATCH 01/22] block: avoid buffer overrun by using pstrcpy, not strncpy |
Date: |
Wed, 9 May 2012 11:23:45 +0200 |
From: Jim Meyering <address@hidden>
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.
Signed-off-by: Jim Meyering <address@hidden>
---
block.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 43c794c..ddc0f58 100644
--- a/block.c
+++ b/block.c
@@ -1162,7 +1162,7 @@ int bdrv_commit(BlockDriverState *bs)
int n, ro, open_flags;
int ret = 0, rw_ret = 0;
uint8_t *buf;
- char filename[1024];
+ char filename[PATH_MAX];
BlockDriverState *bs_rw, *bs_ro;
if (!drv)
@@ -1182,7 +1182,8 @@ int bdrv_commit(BlockDriverState *bs)
backing_drv = bs->backing_hd->drv;
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;
if (ro) {
--
1.7.10.1.487.ga3935e6
- [Qemu-devel] strncpy: best avoided (resend), Jim Meyering, 2012/05/09
- [Qemu-devel] [PATCH 09/22] ui/vnc: simplify and avoid strncpy, Jim Meyering, 2012/05/09
- [Qemu-devel] [PATCH 10/22] bt: replace fragile snprintf use and unwarranted strncpy, Jim Meyering, 2012/05/09
- [Qemu-devel] [PATCH 12/22] virtio-9p: avoid unwarranted use of strncpy, Jim Meyering, 2012/05/09
- [Qemu-devel] [PATCH 06/22] os-posix: avoid buffer overrun, Jim Meyering, 2012/05/09
- [Qemu-devel] [PATCH 01/22] block: avoid buffer overrun by using pstrcpy, not strncpy,
Jim Meyering <=
- [Qemu-devel] [PATCH 18/22] acpi: remove strzcpy (strncpy-identical) function; just use strncpy, Jim Meyering, 2012/05/09
- [Qemu-devel] [PATCH 22/22] doc: update HACKING wrt strncpy/pstrcpy, Jim Meyering, 2012/05/09
- [Qemu-devel] [PATCH 11/22] virtio-9p: avoid unwarranted uses of strncpy, Jim Meyering, 2012/05/09
- [Qemu-devel] [PATCH 17/22] libcacard/vcard_emul_nss: use pstrcpy in place of strncpy, Jim Meyering, 2012/05/09
- [Qemu-devel] [PATCH 16/22] qemu-ga: prefer pstrcpy: consistently NUL-terminate ifreq.ifr_name, Jim Meyering, 2012/05/09