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

cleanup: use just PATH_MAX size

Browse Source 
Avoid playing with +1.

PATH_MAX code needs probably more thinking anyway, since
there is no MAX path in Linux - user may easily create path
with 64kB chars - so 4kB buffer is surelly not enough for
such dirs.

Note:
http://insanecoding.blogspot.cz/2007/11/pathmax-simply-isnt.html
This commit is contained in:
Zdenek Kabelac 2014-08-19 11:35:18 +02:00
parent 5cd3b5c0cf
commit 94786a3bbf
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/device/dev-type.c
View File

@ -348,8 +348,8 @@ int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
const char *sysfs_dir = dm_sysfs_dir(); const char *sysfs_dir = dm_sysfs_dir();
int major = (int) MAJOR(dev->dev); int major = (int) MAJOR(dev->dev);
int minor = (int) MINOR(dev->dev); int minor = (int) MINOR(dev->dev);
char path[PATH_MAX+1]; char path[PATH_MAX];
char temp_path[PATH_MAX+1]; char temp_path[PATH_MAX];
char buffer[64]; char buffer[64];
struct stat info; struct stat info;
FILE *fp = NULL; FILE *fp = NULL;
@ -378,7 +378,7 @@ int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
*/ */
/* check if dev is a partition */ /* check if dev is a partition */
if (dm_snprintf(path, PATH_MAX, "%s/dev/block/%d:%d/partition", if (dm_snprintf(path, sizeof(path), "%s/dev/block/%d:%d/partition",
sysfs_dir, major, minor) < 0) { sysfs_dir, major, minor) < 0) {
log_error("dm_snprintf partition failed"); log_error("dm_snprintf partition failed");
goto out; goto out;
@ -400,14 +400,14 @@ int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
* - basename ../../block/md0/md0 = md0 * - basename ../../block/md0/md0 = md0
* Parent's 'dev' sysfs attribute = /sys/block/md0/dev * Parent's 'dev' sysfs attribute = /sys/block/md0/dev
*/ */
if ((size = readlink(dirname(path), temp_path, PATH_MAX)) < 0) { if ((size = readlink(dirname(path), temp_path, sizeof(temp_path) - 1)) < 0) {
log_sys_error("readlink", path); log_sys_error("readlink", path);
goto out; goto out;
} }
temp_path[size] = '\0'; temp_path[size] = '\0';
if (dm_snprintf(path, PATH_MAX, "%s/block/%s/dev", if (dm_snprintf(path, sizeof(path), "%s/block/%s/dev",
sysfs_dir, basename(dirname(temp_path))) < 0) { sysfs_dir, basename(dirname(temp_path))) < 0) {
log_error("dm_snprintf dev failed"); log_error("dm_snprintf dev failed");
goto out; goto out;

5
lib/filters/filter-mpath.c
View File

@ -145,9 +145,8 @@ static int _dev_is_mpath(struct dev_filter *f, struct device *dev)
{ {
struct dev_types *dt = (struct dev_types *) f->private; struct dev_types *dt = (struct dev_types *) f->private;
const char *part_name, *name; const char *part_name, *name;
char path[PATH_MAX+1];
char parent_name[PATH_MAX+1];
struct stat info; struct stat info;
char path[PATH_MAX], parent_name[PATH_MAX];
const char *sysfs_dir = dm_sysfs_dir(); const char *sysfs_dir = dm_sysfs_dir();
int major = MAJOR(dev->dev); int major = MAJOR(dev->dev);
int minor = MINOR(dev->dev); int minor = MINOR(dev->dev);
@ -175,7 +174,7 @@ static int _dev_is_mpath(struct dev_filter *f, struct device *dev)
return 0; return 0;
} }
if (dm_snprintf(path, PATH_MAX, "%s/block/%s/holders", sysfs_dir, name) < 0) { if (dm_snprintf(path, sizeof(path), "%s/block/%s/holders", sysfs_dir, name) < 0) {
log_error("Sysfs path to check mpath is too long."); log_error("Sysfs path to check mpath is too long.");
return 0; return 0;
} }

4
libdm/libdm-common.c
View File

@ -1649,8 +1649,8 @@ static void _unmangle_mountinfo_string(const char *src, char *buf)
/* Parse one line of mountinfo and unmangled target line */ /* Parse one line of mountinfo and unmangled target line */
static int _mountinfo_parse_line(const char *line, unsigned *maj, unsigned *min, char *buf) static int _mountinfo_parse_line(const char *line, unsigned *maj, unsigned *min, char *buf)
{ {
char root[PATH_MAX + 1]; char root[PATH_MAX];
char target[PATH_MAX + 1]; char target[PATH_MAX];
/* TODO: maybe detect availability of %ms glib support ? */ /* TODO: maybe detect availability of %ms glib support ? */
if (sscanf(line, "%*u %*u %u:%u %" DM_TO_STRING(PATH_MAX) if (sscanf(line, "%*u %*u %u:%u %" DM_TO_STRING(PATH_MAX)