shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

pvscan: ensure read buffer ends with 0

Browse Source 
Read buffersize - 1 so the last byte is always 0.
Simplify init of 0 buffers.
Check snprintf result for error and report internal error as it could
happen only via bad compile parameters.
This commit is contained in:
Zdenek Kabelac 2021-01-21 21:15:33 +01:00
parent ce6e74f485
commit fa2fa9f36d
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/pvscan.c
View File

@ -206,7 +206,7 @@ static char *_vgname_in_pvid_file_buf(char *buf)
static int _online_pvid_file_read(char *path, int *major, int *minor, char *vgname) static int _online_pvid_file_read(char *path, int *major, int *minor, char *vgname)
{ {
char buf[MAX_PVID_FILE_SIZE]; char buf[MAX_PVID_FILE_SIZE] = { 0 };
char *name; char *name;
int fd, rv; int fd, rv;
@ -216,9 +216,7 @@ static int _online_pvid_file_read(char *path, int *major, int *minor, char *vgna
return 0; return 0;
} }
memset(buf, 0, sizeof(buf)); rv = read(fd, buf, sizeof(buf) - 1);
rv = read(fd, buf, sizeof(buf));
if (close(fd)) if (close(fd))
log_sys_debug("close", path); log_sys_debug("close", path);
if (!rv || rv < 0) { if (!rv || rv < 0) {
@ -350,7 +348,7 @@ static void _online_files_remove(const char *dirpath)
static int _online_pvid_file_create(struct device *dev, const char *vgname) static int _online_pvid_file_create(struct device *dev, const char *vgname)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
char buf[MAX_PVID_FILE_SIZE]; char buf[MAX_PVID_FILE_SIZE] = { 0 };
char file_vgname[NAME_LEN]; char file_vgname[NAME_LEN];
int file_major = 0, file_minor = 0; int file_major = 0, file_minor = 0;
int major, minor; int major, minor;
@ -360,8 +358,6 @@ static int _online_pvid_file_create(struct device *dev, const char *vgname)
int len1 = 0; int len1 = 0;
int len2 = 0; int len2 = 0;
memset(buf, 0, sizeof(buf));
major = (int)MAJOR(dev->dev); major = (int)MAJOR(dev->dev);
minor = (int)MINOR(dev->dev); minor = (int)MINOR(dev->dev);
@ -451,13 +447,14 @@ check_duplicate:
static int _online_pvid_file_exists(const char *pvid) static int _online_pvid_file_exists(const char *pvid)
{ {
char path[PATH_MAX]; char path[PATH_MAX] = { 0 };
struct stat buf; struct stat buf;
int rv; int rv;
memset(path, 0, sizeof(path)); if (dm_snprintf(path, sizeof(path), "%s/%s", _pvs_online_dir, pvid) < 0) {
log_debug(INTERNAL_ERROR "Path %s/%s is too long.", _pvs_online_dir, pvid);
snprintf(path, sizeof(path), "%s/%s", _pvs_online_dir, pvid); return 0;
}
log_debug("Check pv online: %s", path); log_debug("Check pv online: %s", path);