X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=diskutil.c;h=e29d1c34af24d116f9a601437adb798a8ec194cf;hp=fbc4268e800f9068d6bfcf5f3a6bb7a4a54cb4cc;hb=fdc0f3b646e417497849d4398029f780b0e5262f;hpb=aeb32dfccbd052965b0e50714c12265551f61a00 diff --git a/diskutil.c b/diskutil.c index fbc4268e..e29d1c34 100644 --- a/diskutil.c +++ b/diskutil.c @@ -276,13 +276,25 @@ static struct disk_util *disk_util_add(struct thread_data *td, int majdev, { struct disk_util *du, *__du; struct flist_head *entry; + int l; dprint(FD_DISKUTIL, "add maj/min %d/%d: %s\n", majdev, mindev, path); du = smalloc(sizeof(*du)); + if (!du) { + log_err("fio: smalloc() pool exhausted\n"); + return NULL; + } + memset(du, 0, sizeof(*du)); INIT_FLIST_HEAD(&du->list); - sprintf(du->path, "%s/stat", path); + l = snprintf(du->path, sizeof(du->path), "%s/stat", path); + if (l < 0 || l >= sizeof(du->path)) { + log_err("constructed path \"%.100s[...]/stat\" larger than buffer (%zu bytes)\n", + path, sizeof(du->path) - 1); + sfree(du); + return NULL; + } strncpy((char *) du->dus.name, basename(path), FIO_DU_NAME_SZ); du->sysfs_root = path; du->major = majdev;