External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: virdevmapper: Sanitize use of macros for buffer size

Browse Source 
There are two distinct uses of an arbitrary buffers size when querying
the device mapper. One is related to loading the /proc/devices file,
while the other is used as buffer for ioctls to the devmapper.

Split up the macros used here so that it's clear that they are not meant
for the same thing.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-03-29 15:03:50 +02:00
parent 2d6d67e154
commit 45ea6a9fcf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util/virdevmapper.c
View File

@ -42,12 +42,13 @@
VIR_LOG_INIT("util.virdevmapper");
# define PROC_DEVICES "/proc/devices"
# define PROC_DEVICES_BUF_SIZE (16 * 1024)
# define DM_NAME "device-mapper"
# define DEV_DM_DIR "/dev/" DM_DIR
# define CONTROL_PATH DEV_DM_DIR "/" DM_CONTROL_NODE
# define BUF_SIZE (16 * 1024)
G_STATIC_ASSERT(BUF_SIZE > sizeof(struct dm_ioctl));
# define VIR_DEVMAPPER_IOCTL_BUF_SIZE_INCREMENT (16 * 1024)
G_STATIC_ASSERT(VIR_DEVMAPPER_IOCTL_BUF_SIZE_INCREMENT > sizeof(struct dm_ioctl));
static int
@ -60,7 +61,7 @@ virDevMapperGetMajor(unsigned int *major)
if (!virFileExists(CONTROL_PATH))
return -2;
if (virFileReadAll(PROC_DEVICES, BUF_SIZE, &buf) < 0)
if (virFileReadAll(PROC_DEVICES, PROC_DEVICES_BUF_SIZE, &buf) < 0)
return -1;
lines = g_strsplit(buf, "\n", 0);
@ -92,7 +93,7 @@ virDevMapperGetMajor(unsigned int *major)
static void *
virDMIoctl(int controlFD, int cmd, struct dm_ioctl *dm, char **buf)
{
size_t bufsize = BUF_SIZE;
size_t bufsize = VIR_DEVMAPPER_IOCTL_BUF_SIZE_INCREMENT;
reread:
*buf = g_new0(char, bufsize);
@ -113,7 +114,7 @@ virDMIoctl(int controlFD, int cmd, struct dm_ioctl *dm, char **buf)
memcpy(dm, *buf, sizeof(struct dm_ioctl));
if (dm->flags & DM_BUFFER_FULL_FLAG) {
bufsize += BUF_SIZE;
bufsize += VIR_DEVMAPPER_IOCTL_BUF_SIZE_INCREMENT;
VIR_FREE(*buf);
goto reread;
}