Skip to content

Prevent segfault of vhd-util scan on VHD with corrupt footer #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Millefeuille42 wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −1
Open

Prevent segfault of vhd-util scan on VHD with corrupt footer #436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion vhd/lib/vhd-util-scan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#include <sys/stat.h>
#include <sys/types.h>

#include "debug.h"
#include "list.h"
#include "libvhd.h"
#include "lvm-util.h"
Expand Down Expand Up @@ -482,6 +483,14 @@ copy_name(char *dst, const char *src)
static int
vhd_util_scan_extract_volume_name(char *dst, const char *src, size_t size)
{
ASSERT(dst);
ASSERT(src);

if (!*src) {
EPRINTF("parent name is empty\n");
return -EINVAL;
}

char copy[VHD_MAX_NAME_LEN], *name, *s, *c;

name = strrchr(src, '/');
Expand Down Expand Up @@ -509,6 +518,7 @@ vhd_util_scan_extract_volume_name(char *dst, const char *src, size_t size)
return -EINVAL;
}

ASSERT(c && *c == '/');
safe_strncpy(dst, ++c, size);
return 0;
}
Expand Down Expand Up @@ -542,7 +552,7 @@ vhd_util_scan_get_volume_parent(vhd_context_t *vhd, struct vhd_image *image)
if (!err)
return copy_name(image->parent, name);

return 0;
return err;
}

static int
Expand Down