chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udev - safer sprintf() use
[elogind.git]
/
namedev.c
diff --git
a/namedev.c
b/namedev.c
index 2f9d8f5f67b08892b55b86903a82edbd8ac00e22..581a7f2218ca08973d90bef696ba45d1132f2a36 100644
(file)
--- a/
namedev.c
+++ b/
namedev.c
@@
-157,7
+157,7
@@
static mode_t get_default_mode(void)
static char *get_default_owner(void)
{
if (strlen(default_owner_str) == 0)
static char *get_default_owner(void)
{
if (strlen(default_owner_str) == 0)
- str
ncpy(default_owner_str, "root", OWNER_SIZE
);
+ str
fieldcpy(default_owner_str, "root"
);
return default_owner_str;
}
return default_owner_str;
}
@@
-165,7
+165,7
@@
static char *get_default_owner(void)
static char *get_default_group(void)
{
if (strlen(default_group_str) == 0)
static char *get_default_group(void)
{
if (strlen(default_group_str) == 0)
- str
ncpy(default_group_str, "root", GROUP_SIZE
);
+ str
fieldcpy(default_group_str, "root"
);
return default_group_str;
}
return default_group_str;
}
@@
-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 temp1[NAME_SIZE];
{
char temp[NAME_SIZE];
char temp1[NAME_SIZE];
@@
-226,7
+228,7
@@
static void apply_format(struct udevice *udev, unsigned char *string, struct sys
pos = string;
while (1) {
pos = string;
while (1) {
- pos = strchr(
pos
, '%');
+ pos = strchr(
string
, '%');
if (pos != NULL) {
pos[0] = '\0';
tail = pos+1;
if (pos != NULL) {
pos[0] = '\0';
tail = pos+1;
@@
-245,27
+247,27
@@
static void apply_format(struct udevice *udev, unsigned char *string, struct sys
case 'b':
if (strlen(udev->bus_id) == 0)
break;
case 'b':
if (strlen(udev->bus_id) == 0)
break;
- str
cat(pos, udev->bus_id
);
+ str
nfieldcat(string, udev->bus_id, maxsize
);
dbg("substitute bus_id '%s'", udev->bus_id);
break;
case 'k':
if (strlen(udev->kernel_name) == 0)
break;
dbg("substitute bus_id '%s'", udev->bus_id);
break;
case 'k':
if (strlen(udev->kernel_name) == 0)
break;
- str
cat(pos, udev->kernel_nam
e);
+ str
nfieldcat(string, udev->kernel_name, maxsiz
e);
dbg("substitute kernel name '%s'", udev->kernel_name);
break;
case 'n':
if (strlen(udev->kernel_number) == 0)
break;
dbg("substitute kernel name '%s'", udev->kernel_name);
break;
case 'n':
if (strlen(udev->kernel_number) == 0)
break;
- str
cat(pos, udev->kernel_number
);
+ str
nfieldcat(string, udev->kernel_number, maxsize
);
dbg("substitute kernel number '%s'", udev->kernel_number);
break;
case 'm':
dbg("substitute kernel number '%s'", udev->kernel_number);
break;
case 'm':
- s
printf(pos, "%u", udev->minor
);
+ s
trnintcat(string, udev->minor, maxsize
);
dbg("substitute minor number '%u'", udev->minor);
break;
dbg("substitute minor number '%u'", udev->minor);
break;
-
case 'M':
- s
printf(pos, "%u", udev->major
);
+ case 'M':
+ s
trnintcat(string, udev->major, maxsize
);
dbg("substitute major number '%u'", udev->major);
break;
case 'c':
dbg("substitute major number '%u'", udev->major);
break;
case 'c':
@@
-276,7
+278,7
@@
static void apply_format(struct udevice *udev, unsigned char *string, struct sys
if (attr != NULL)
i = atoi(attr);
if (i > 0) {
if (attr != NULL)
i = atoi(attr);
if (i > 0) {
- str
ncpy(temp1, udev->program_result, sizeof(temp1)
);
+ str
fieldcpy(temp1, udev->program_result
);
pos2 = temp1;
while (i) {
i--;
pos2 = temp1;
while (i) {
i--;
@@
-287,11
+289,11
@@
static void apply_format(struct udevice *udev, unsigned char *string, struct sys
}
}
if (pos3) {
}
}
if (pos3) {
- str
cat(pos, pos3
);
+ str
nfieldcat(string, pos3, maxsize
);
dbg("substitute part of result string '%s'", pos3);
}
} else {
dbg("substitute part of result string '%s'", pos3);
}
} else {
- str
cat(pos, udev->program_result
);
+ str
nfieldcat(string, udev->program_result, maxsize
);
dbg("substitute result string '%s'", udev->program_result);
}
break;
dbg("substitute result string '%s'", udev->program_result);
}
break;
@@
-302,20
+304,20
@@
static void apply_format(struct udevice *udev, unsigned char *string, struct sys
dbg("sysfa attribute '%s' not found", attr);
break;
}
dbg("sysfa attribute '%s' not found", attr);
break;
}
- str
cpy(pos, tmpattr->valu
e);
+ str
nfieldcat(string, tmpattr->value, maxsiz
e);
dbg("substitute sysfs value '%s'", tmpattr->value);
} else {
dbg("missing attribute");
}
break;
case '%':
dbg("substitute sysfs value '%s'", tmpattr->value);
} else {
dbg("missing attribute");
}
break;
case '%':
- str
cat(pos, "%"
);
+ str
nfieldcat(string, "%", maxsize
);
break;
default:
dbg("unknown substitution type '%%%c'", c);
break;
}
break;
default:
dbg("unknown substitution type '%%%c'", c);
break;
}
- str
cat(pos, tail
);
+ str
nfieldcat(string, tail, maxsize
);
}
}
}
}
@@
-403,7
+405,7
@@
static int execute_program(char *path, char *value, int len)
int fds[2];
pid_t pid;
int value_set = 0;
int fds[2];
pid_t pid;
int value_set = 0;
- char buffer[25
6
];
+ char buffer[25
5
];
char *pos;
char *args[PROGRAM_MAXARG];
int i;
char *pos;
char *args[PROGRAM_MAXARG];
int i;
@@
-419,7
+421,13
@@
static int execute_program(char *path, char *value, int len)
case 0:
/* child */
close(STDOUT_FILENO);
case 0:
/* child */
close(STDOUT_FILENO);
- dup(fds[1]); /* dup write side of pipe to STDOUT */
+
+ /* dup write side of pipe to STDOUT */
+ dup(fds[1]);
+
+ /* copy off our path to use incase we have too many args */
+ strnfieldcpy(buffer, path, sizeof(buffer));
+
if (strchr(path, ' ')) {
/* exec with arguments */
pos = path;
if (strchr(path, ' ')) {
/* exec with arguments */
pos = path;
@@
-429,14
+437,16
@@
static int execute_program(char *path, char *value, int len)
break;
}
if (args[i]) {
break;
}
if (args[i]) {
- dbg("too many args - %d", i);
- args[i] = NULL;
+ dbg("too many args - %d, using subshell instead '%s'", i, buffer);
+ retval = execl("/bin/sh", "sh", "-c", buffer, NULL);
+ } else {
+ dbg("execute program '%s'", path);
+ retval = execv(args[0], args);
}
}
- retval = execv(args[0], args);
} else {
retval = execv(path, main_argv);
}
} else {
retval = execv(path, main_argv);
}
-
dbg("child execve failed"
);
+
info(FIELD_PROGRAM " execution of '%s' failed", path
);
exit(1);
case -1:
dbg("fork failed");
exit(1);
case -1:
dbg("fork failed");
@@
-462,7
+472,7
@@
static int execute_program(char *path, char *value, int len)
strncpy(value, buffer, len);
pos = value + strlen(value)-1;
if (pos[0] == '\n')
strncpy(value, buffer, len);
pos = value + strlen(value)-1;
if (pos[0] == '\n')
- pos[0] = '\0';
+
pos[0] = '\0';
dbg("result is '%s'", value);
}
}
dbg("result is '%s'", value);
}
}
@@
-733,7
+743,8
@@
static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
/* execute external program */
if (dev->program[0] != '\0') {
dbg("check " FIELD_PROGRAM);
/* execute external program */
if (dev->program[0] != '\0') {
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) {
dbg(FIELD_PROGRAM " returned nozero");
goto try_parent;
if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
dbg(FIELD_PROGRAM " returned nozero");
goto try_parent;
@@
-825,8
+836,10
@@
int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
found:
/* substitute placeholder */
found:
/* substitute placeholder */
- apply_format(udev, udev->name, class_dev, sysfs_device);
- apply_format(udev, udev->symlink, class_dev, sysfs_device);
+ apply_format(udev, udev->name, sizeof(udev->name),
+ class_dev, sysfs_device);
+ apply_format(udev, udev->symlink, sizeof(udev->symlink),
+ class_dev, sysfs_device);
udev->partitions = dev->partitions;
done:
perm = find_perm(udev->name);
udev->partitions = dev->partitions;
done:
perm = find_perm(udev->name);
@@
-837,8
+850,8
@@
done:
} else {
/* no matching perms found :( */
udev->mode = get_default_mode();
} else {
/* no matching perms found :( */
udev->mode = get_default_mode();
- str
ncpy(udev->owner, get_default_owner(), OWNER_SIZE
);
- str
ncpy(udev->group, get_default_group(), GROUP_SIZE
);
+ str
fieldcpy(udev->owner, get_default_owner()
);
+ str
fieldcpy(udev->group, get_default_group()
);
}
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);
}
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);