Skip to content
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

Jump to bottom

common/blkdev: use realpath instead of readlink to resolve the recurs… #12462

Merged
merged 1 commit into from Dec 15, 2016
Merged

common/blkdev: use realpath instead of readlink to resolve the recurs… #12462

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/common/blkdev.cc
View file
Open in desktop
Expand Up @@ -65,21 +65,23 @@ int get_block_device_base(const char *dev, char *out, size_t out_len)
struct stat st;
int r = 0;
DIR *dir;
char devname[PATH_MAX], fn[PATH_MAX];
char devname[PATH_MAX] = {0}, fn[PATH_MAX] = {0};
char *p;
char realname[PATH_MAX] = {0};

if (strncmp(dev, "/dev/", 5) != 0) {
if ((readlink(dev, realname, sizeof(realname)) == -1) || (strncmp(realname, "/dev/", 5) != 0))
if (realpath(dev, realname) == NULL || (strncmp(realname, "/dev/", 5) != 0)) {
return -EINVAL;
}
}

if (strlen(realname))
strncpy(devname, realname + 5, PATH_MAX -1);
strncpy(devname, realname + 5, PATH_MAX - 5);
else
strncpy(devname, dev + 5, PATH_MAX-1);
strncpy(devname, dev + 5, strlen(dev) - 5);

devname[PATH_MAX - 1] = '\0';

devname[PATH_MAX-1] = '\0';
for (p = devname; *p; ++p)
if (*p == '/')
*p = '!';
Expand Down