mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-02 01:18:26 +03:00
pvscan: fix error message for invalid devname
uninitialized name buffer used in message. fixes "pvs_online: include devname in pvid files"
This commit is contained in:
parent
05d9a01351
commit
c42a05c3ec
@ -2102,7 +2102,7 @@ int setup_devices_for_online_autoactivation(struct cmd_context *cmd)
|
|||||||
static char *_get_devname_from_devno(struct cmd_context *cmd, dev_t devno)
|
static char *_get_devname_from_devno(struct cmd_context *cmd, dev_t devno)
|
||||||
{
|
{
|
||||||
char path[PATH_MAX];
|
char path[PATH_MAX];
|
||||||
char devname[PATH_MAX];
|
char devname[PATH_MAX] = { 0 };
|
||||||
char namebuf[NAME_LEN];
|
char namebuf[NAME_LEN];
|
||||||
char line[1024];
|
char line[1024];
|
||||||
int major = MAJOR(devno);
|
int major = MAJOR(devno);
|
||||||
@ -2114,6 +2114,9 @@ static char *_get_devname_from_devno(struct cmd_context *cmd, dev_t devno)
|
|||||||
struct dirent *dirent;
|
struct dirent *dirent;
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
|
||||||
|
if (!devno)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* $ ls /sys/dev/block/8:0/device/block/
|
* $ ls /sys/dev/block/8:0/device/block/
|
||||||
* sda
|
* sda
|
||||||
@ -2251,6 +2254,8 @@ struct device *setup_dev_in_dev_cache(struct cmd_context *cmd, dev_t devno, cons
|
|||||||
if (devname) {
|
if (devname) {
|
||||||
if (stat(devname, &buf) < 0) {
|
if (stat(devname, &buf) < 0) {
|
||||||
log_error("Cannot access device %s for %d:%d.", devname, major, minor);
|
log_error("Cannot access device %s for %d:%d.", devname, major, minor);
|
||||||
|
if (!devno)
|
||||||
|
return_NULL;
|
||||||
if (!(devname = _get_devname_from_devno(cmd, devno))) {
|
if (!(devname = _get_devname_from_devno(cmd, devno))) {
|
||||||
log_error("No device name found from %d:%d.", major, minor);
|
log_error("No device name found from %d:%d.", major, minor);
|
||||||
return_NULL;
|
return_NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user