[PATCH] udev - safer string handling - part two
As promised, here is the next round. We provide in addition to the already used macros: strfieldcpy(to, from) strfieldcat(to, from) the corresponding friends, if the size of the target is not known and must be provided by the caller: strnfieldcpy(to, from, maxsize) strnfieldcat(to, from, maxsize) and switch nearly all possibly unsafe users of strcat(), strncat(), strcpy() and strncpy() to these safer macros. The last known remaining issue seems the use of sprintf() and snprintf(). I will take on it later today or tomorrow.
This commit is contained in:
parent
bef370d6eb
commit
831f800da3
29
namedev.c
29
namedev.c
|
@ -209,7 +209,9 @@ static int get_format_len(char **str)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void apply_format(struct udevice *udev, unsigned char *string, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
|
static void apply_format(struct udevice *udev, char *string, size_t maxsize,
|
||||||
|
struct sysfs_class_device *class_dev,
|
||||||
|
struct sysfs_device *sysfs_device)
|
||||||
{
|
{
|
||||||
char temp[NAME_SIZE];
|
char temp[NAME_SIZE];
|
||||||
char temp1[NAME_SIZE];
|
char temp1[NAME_SIZE];
|
||||||
|
@ -245,19 +247,19 @@ static void apply_format(struct udevice *udev, unsigned char *string, struct sys
|
||||||
case 'b':
|
case 'b':
|
||||||
if (strlen(udev->bus_id) == 0)
|
if (strlen(udev->bus_id) == 0)
|
||||||
break;
|
break;
|
||||||
strcat(pos, udev->bus_id);
|
strnfieldcat(pos, udev->bus_id, maxsize);
|
||||||
dbg("substitute bus_id '%s'", udev->bus_id);
|
dbg("substitute bus_id '%s'", udev->bus_id);
|
||||||
break;
|
break;
|
||||||
case 'k':
|
case 'k':
|
||||||
if (strlen(udev->kernel_name) == 0)
|
if (strlen(udev->kernel_name) == 0)
|
||||||
break;
|
break;
|
||||||
strcat(pos, udev->kernel_name);
|
strnfieldcat(pos, udev->kernel_name, maxsize);
|
||||||
dbg("substitute kernel name '%s'", udev->kernel_name);
|
dbg("substitute kernel name '%s'", udev->kernel_name);
|
||||||
break;
|
break;
|
||||||
case 'n':
|
case 'n':
|
||||||
if (strlen(udev->kernel_number) == 0)
|
if (strlen(udev->kernel_number) == 0)
|
||||||
break;
|
break;
|
||||||
strcat(pos, udev->kernel_number);
|
strnfieldcat(pos, udev->kernel_number, maxsize);
|
||||||
dbg("substitute kernel number '%s'", udev->kernel_number);
|
dbg("substitute kernel number '%s'", udev->kernel_number);
|
||||||
break;
|
break;
|
||||||
case 'm':
|
case 'm':
|
||||||
|
@ -287,11 +289,11 @@ static void apply_format(struct udevice *udev, unsigned char *string, struct sys
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (pos3) {
|
if (pos3) {
|
||||||
strcat(pos, pos3);
|
strnfieldcat(pos, pos3, maxsize);
|
||||||
dbg("substitute part of result string '%s'", pos3);
|
dbg("substitute part of result string '%s'", pos3);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
strcat(pos, udev->program_result);
|
strnfieldcat(pos, udev->program_result, maxsize);
|
||||||
dbg("substitute result string '%s'", udev->program_result);
|
dbg("substitute result string '%s'", udev->program_result);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -302,20 +304,20 @@ static void apply_format(struct udevice *udev, unsigned char *string, struct sys
|
||||||
dbg("sysfa attribute '%s' not found", attr);
|
dbg("sysfa attribute '%s' not found", attr);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
strcpy(pos, tmpattr->value);
|
strnfieldcpy(pos, tmpattr->value, maxsize);
|
||||||
dbg("substitute sysfs value '%s'", tmpattr->value);
|
dbg("substitute sysfs value '%s'", tmpattr->value);
|
||||||
} else {
|
} else {
|
||||||
dbg("missing attribute");
|
dbg("missing attribute");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case '%':
|
case '%':
|
||||||
strcat(pos, "%");
|
strnfieldcat(pos, "%", maxsize);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dbg("unknown substitution type '%%%c'", c);
|
dbg("unknown substitution type '%%%c'", c);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
strcat(pos, tail);
|
strnfieldcat(pos, tail, maxsize);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -733,7 +735,8 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
|
||||||
/* execute external program */
|
/* execute external program */
|
||||||
if (dev->program[0] != '\0') {
|
if (dev->program[0] != '\0') {
|
||||||
dbg("check " FIELD_PROGRAM);
|
dbg("check " FIELD_PROGRAM);
|
||||||
apply_format(udev, dev->program, class_dev, sysfs_device);
|
apply_format(udev, dev->program, sizeof(dev->program),
|
||||||
|
class_dev, sysfs_device);
|
||||||
if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
|
if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
|
||||||
dbg(FIELD_PROGRAM " returned nozero");
|
dbg(FIELD_PROGRAM " returned nozero");
|
||||||
goto try_parent;
|
goto try_parent;
|
||||||
|
@ -825,8 +828,10 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
|
||||||
|
|
||||||
found:
|
found:
|
||||||
/* substitute placeholder */
|
/* substitute placeholder */
|
||||||
apply_format(udev, udev->name, class_dev, sysfs_device);
|
apply_format(udev, udev->name, sizeof(udev->name),
|
||||||
apply_format(udev, udev->symlink, class_dev, sysfs_device);
|
class_dev, sysfs_device);
|
||||||
|
apply_format(udev, udev->symlink, sizeof(udev->symlink),
|
||||||
|
class_dev, sysfs_device);
|
||||||
udev->partitions = dev->partitions;
|
udev->partitions = dev->partitions;
|
||||||
done:
|
done:
|
||||||
perm = find_perm(udev->name);
|
perm = find_perm(udev->name);
|
||||||
|
|
12
udev.h
12
udev.h
|
@ -67,6 +67,18 @@ do { \
|
||||||
strncat(to, from, sizeof(to) - strlen(to)-1); \
|
strncat(to, from, sizeof(to) - strlen(to)-1); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
#define strnfieldcpy(to, from, maxsize) \
|
||||||
|
do { \
|
||||||
|
to[maxsize-1] = '\0'; \
|
||||||
|
strncpy(to, from, maxsize-1); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define strnfieldcat(to, from, maxsize) \
|
||||||
|
do { \
|
||||||
|
to[maxsize-1] = '\0'; \
|
||||||
|
strncat(to, from, maxsize - strlen(to)-1); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
extern int udev_add_device(char *path, char *subsystem, int fake);
|
extern int udev_add_device(char *path, char *subsystem, int fake);
|
||||||
extern int udev_remove_device(char *path, char *subsystem);
|
extern int udev_remove_device(char *path, char *subsystem);
|
||||||
extern void udev_init_config(void);
|
extern void udev_init_config(void);
|
||||||
|
|
|
@ -81,7 +81,7 @@ static void init_variables(void)
|
||||||
#define set_var(_name, _var) \
|
#define set_var(_name, _var) \
|
||||||
if (strcasecmp(variable, _name) == 0) { \
|
if (strcasecmp(variable, _name) == 0) { \
|
||||||
dbg_parse("%s = '%s'", _name, value); \
|
dbg_parse("%s = '%s'", _name, value); \
|
||||||
strncpy(_var, value, sizeof(_var)); \
|
strnfieldcpy(_var, value, sizeof(_var));\
|
||||||
}
|
}
|
||||||
|
|
||||||
#define set_bool(_name, _var) \
|
#define set_bool(_name, _var) \
|
||||||
|
|
Loading…
Reference in a new issue