shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

reset process priority before executing RUN+=

Browse Source 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=581235
This commit is contained in:
Kay Sievers 2010-05-12 08:46:56 +02:00
parent 1ecfdba0dd
commit e85f5ec15f
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libudev/libudev-private.h
View File

@ -217,7 +217,7 @@ uid_t util_lookup_user(struct udev *udev, const char *user);
gid_t util_lookup_group(struct udev *udev, const char *group);
int util_run_program(struct udev *udev, const char *command, char **envp,
char *result, size_t ressize, size_t *reslen,
const sigset_t *sigmask);
const sigset_t *sigmask, bool reset_prio);
int util_resolve_subsys_kernel(struct udev *udev, const char *string,
char *result, size_t maxsize, int read_value);

4
libudev/libudev-util-private.c
View File

@ -254,7 +254,7 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string,
int util_run_program(struct udev *udev, const char *command, char **envp,
char *result, size_t ressize, size_t *reslen,
const sigset_t *sigmask)
const sigset_t *sigmask, bool reset_prio)
{
int status;
int outpipe[2] = {-1, -1};
@ -349,6 +349,8 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
if (sigmask)
sigprocmask(SIG_SETMASK, sigmask, NULL);
if (reset_prio)
setpriority(PRIO_PROCESS, 0, 0);
execve(argv[0], argv, envp);
if (errno == ENOENT || errno == ENOTDIR) {

2
udev/udev-event.c
View File

@ -677,7 +677,7 @@ int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)
udev_event_apply_format(event, cmd, program, sizeof(program));
envp = udev_device_get_properties_envp(event->dev);
if (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask) != 0) {
if (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask, true) != 0) {
if (udev_list_entry_get_flags(list_entry))
err = -1;
}

4
udev/udev-rules.c
View File

@ -747,7 +747,7 @@ static int import_program_into_properties(struct udev_device *dev, const char *p
char *line;
envp = udev_device_get_properties_envp(dev);
if (util_run_program(udev, program, envp, result, sizeof(result), &reslen, NULL) != 0)
if (util_run_program(udev, program, envp, result, sizeof(result), &reslen, NULL, false) != 0)
return -1;
line = result;
@ -2255,7 +2255,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
program,
&rules->buf[rule->rule.filename_off],
rule->rule.filename_line);
if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL, NULL) != 0) {
if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL, NULL, false) != 0) {
if (cur->key.op != OP_NOMATCH)
goto nomatch;
} else {