diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-04-30 20:21:00 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-05-05 15:06:42 -0700 |
| commit | 7410616cd9dbbec97cf98d75324da5cda2b2f7a2 (patch) | |
| tree | 6d968995b3bdf961603ab4853bf078c0dbdce27c /src/hibernate-resume | |
| parent | 6442185ab674cc202d63c18605057b9a51ca2722 (diff) | |
core: rework unit name validation and manipulation logic
A variety of changes:
- Make sure all our calls distuingish OOM from other errors if OOM is
not the only error possible.
- Be much stricter when parsing escaped paths, do not accept trailing or
leading escaped slashes.
- Change unit validation to take a bit mask for allowing plain names,
instance names or template names or an combination thereof.
- Refuse manipulating invalid unit name
Diffstat (limited to 'src/hibernate-resume')
| -rw-r--r-- | src/hibernate-resume/hibernate-resume-generator.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c index 0207346b28..9fb6233336 100644 --- a/src/hibernate-resume/hibernate-resume-generator.c +++ b/src/hibernate-resume/hibernate-resume-generator.c @@ -32,6 +32,7 @@ static const char *arg_dest = "/tmp"; static char *arg_resume_dev = NULL; static int parse_proc_cmdline_item(const char *key, const char *value) { + if (streq(key, "resume") && value) { free(arg_resume_dev); arg_resume_dev = fstab_node_to_udev_node(value); @@ -44,13 +45,14 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { static int process_resume(void) { _cleanup_free_ char *name = NULL, *lnk = NULL; + int r; if (!arg_resume_dev) return 0; - name = unit_name_from_path_instance("systemd-hibernate-resume", arg_resume_dev, ".service"); - if (!name) - return log_oom(); + r = unit_name_from_path_instance("systemd-hibernate-resume", arg_resume_dev, ".service", &name); + if (r < 0) + return log_error_errno(r, "Failed to generate unit name: %m"); lnk = strjoin(arg_dest, "/" SPECIAL_SYSINIT_TARGET ".wants/", name, NULL); if (!lnk) |