dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

udev: modernize udev-rules.c

Browse Source 
This does the following:
- rename enum udev_builtin_cmd -> UdevBuiltinCmd
- rename struct udev_builtin -> UdevBuiltin
- move type definitions to udev-rules.h
- move prototypes of functions defined in udev-rules.c to udev-rules.h
- drop to use strbuf
- propagate critical errors in applying rules,
- drop limitation for number of tokens per line.
This commit is contained in:
Yu Watanabe
2019-04-25 01:21:11 +02:00
parent 7e4831d296
commit 25de7aa7b9
24 changed files with 2158 additions and 2474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fuzz/fuzz-udev-rules.c
View File

@@ -14,7 +14,7 @@
#include "rm-rf.h"
#include "string-util.h"
#include "tests.h"
#include "udev.h"
#include "udev-rules.h"
static struct fakefs {
const char *target;

2
src/shared/udev-util.c
View File

@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#include <errno.h>
#include <string.h>
#include "alloc-util.h"
#include "env-file.h"
@@ -10,7 +9,6 @@
#include "string-table.h"
#include "string-util.h"
#include "udev-util.h"
#include "udev.h"
static const char* const resolve_name_timing_table[_RESOLVE_NAME_TIMING_MAX] = {
[RESOLVE_NAME_NEVER] = "never",

2
src/test/test-udev.c
View File

@@ -22,7 +22,7 @@
#include "signal-util.h"
#include "string-util.h"
#include "tests.h"
#include "udev.h"
#include "udev-event.h"
static int fake_filesystems(void) {
static const struct fakefs {

4
src/udev/meson.build
View File

@@ -18,13 +18,14 @@ udevadm_sources = files('''
systemd_udevd_sources = files('udevd.c')
libudev_core_sources = '''
udev.h
udev-ctrl.c
udev-ctrl.h
udev-event.c
udev-event.h
udev-node.c
udev-node.h
udev-rules.c
udev-rules.h
udev-watch.c
udev-watch.h
udev-builtin.c
@@ -117,7 +118,6 @@ libudev_basic = static_library(
libudev_static = static_library(
'udev_static',
'udev.h',
include_directories : includes,
link_with : udev_link_with,
link_whole : libudev_basic)

2
src/udev/udev-builtin-blkid.c
View File

@@ -310,7 +310,7 @@ static int builtin_blkid(sd_device *dev, int argc, char *argv[], bool test) {
return 0;
}
const struct udev_builtin udev_builtin_blkid = {
const UdevBuiltin udev_builtin_blkid = {
.name = "blkid",
.cmd = builtin_blkid,
.help = "Filesystem and partition probing",

2
src/udev/udev-builtin-btrfs.c
View File

@@ -33,7 +33,7 @@ static int builtin_btrfs(sd_device *dev, int argc, char *argv[], bool test) {
return 0;
}
const struct udev_builtin udev_builtin_btrfs = {
const UdevBuiltin udev_builtin_btrfs = {
.name = "btrfs",
.cmd = builtin_btrfs,
.help = "btrfs volume management",

2
src/udev/udev-builtin-hwdb.c
View File

@@ -208,7 +208,7 @@ static bool builtin_hwdb_validate(void) {
return hwdb_validate(hwdb);
}
const struct udev_builtin udev_builtin_hwdb = {
const UdevBuiltin udev_builtin_hwdb = {
.name = "hwdb",
.cmd = builtin_hwdb,
.init = builtin_hwdb_init,

2
src/udev/udev-builtin-input_id.c
View File

@@ -357,7 +357,7 @@ static int builtin_input_id(sd_device *dev, int argc, char *argv[], bool test) {
return 0;
}
const struct udev_builtin udev_builtin_input_id = {
const UdevBuiltin udev_builtin_input_id = {
.name = "input_id",
.cmd = builtin_input_id,
.help = "Input device properties",

2
src/udev/udev-builtin-keyboard.c
View File

@@ -251,7 +251,7 @@ static int builtin_keyboard(sd_device *dev, int argc, char *argv[], bool test) {
return 0;
}
const struct udev_builtin udev_builtin_keyboard = {
const UdevBuiltin udev_builtin_keyboard = {
.name = "keyboard",
.cmd = builtin_keyboard,
.help = "Keyboard scan code to key mapping",

2
src/udev/udev-builtin-kmod.c
View File

@@ -66,7 +66,7 @@ static bool builtin_kmod_validate(void) {
return (kmod_validate_resources(ctx) != KMOD_RESOURCES_OK);
}
const struct udev_builtin udev_builtin_kmod = {
const UdevBuiltin udev_builtin_kmod = {
.name = "kmod",
.cmd = builtin_kmod,
.init = builtin_kmod_init,

2
src/udev/udev-builtin-net_id.c
View File

@@ -927,7 +927,7 @@ static int builtin_net_id(sd_device *dev, int argc, char *argv[], bool test) {
return 0;
}
const struct udev_builtin udev_builtin_net_id = {
const UdevBuiltin udev_builtin_net_id = {
.name = "net_id",
.cmd = builtin_net_id,
.help = "Network device properties",

2
src/udev/udev-builtin-net_setup_link.c
View File

@@ -74,7 +74,7 @@ static bool builtin_net_setup_link_validate(void) {
return link_config_should_reload(ctx);
}
const struct udev_builtin udev_builtin_net_setup_link = {
const UdevBuiltin udev_builtin_net_setup_link = {
.name = "net_setup_link",
.cmd = builtin_net_setup_link,
.init = builtin_net_setup_link_init,

2
src/udev/udev-builtin-path_id.c
View File

@@ -675,7 +675,7 @@ static int builtin_path_id(sd_device *dev, int argc, char *argv[], bool test) {
return 0;
}
const struct udev_builtin udev_builtin_path_id = {
const UdevBuiltin udev_builtin_path_id = {
.name = "path_id",
.cmd = builtin_path_id,
.help = "Compose persistent device path",

2
src/udev/udev-builtin-uaccess.c
View File

@@ -73,7 +73,7 @@ finish:
return r;
}
const struct udev_builtin udev_builtin_uaccess = {
const UdevBuiltin udev_builtin_uaccess = {
.name = "uaccess",
.cmd = builtin_uaccess,
.help = "Manage device node user ACL",

2
src/udev/udev-builtin-usb_id.c
View File

@@ -455,7 +455,7 @@ fallback:
return 0;
}
const struct udev_builtin udev_builtin_usb_id = {
const UdevBuiltin udev_builtin_usb_id = {
.name = "usb_id",
.cmd = builtin_usb_id,
.help = "USB device properties",

12
src/udev/udev-builtin.c
View File

@@ -12,7 +12,7 @@
static bool initialized;
static const struct udev_builtin *const builtins[_UDEV_BUILTIN_MAX] = {
static const UdevBuiltin *const builtins[_UDEV_BUILTIN_MAX] = {
#if HAVE_BLKID
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
#endif
@@ -75,7 +75,7 @@ void udev_builtin_list(void) {
fprintf(stderr, " %-14s %s\n", builtins[i]->name, builtins[i]->help);
}
const char *udev_builtin_name(enum udev_builtin_cmd cmd) {
const char *udev_builtin_name(UdevBuiltinCommand cmd) {
assert(cmd >= 0 && cmd < _UDEV_BUILTIN_MAX);
if (!builtins[cmd])
@@ -84,7 +84,7 @@ const char *udev_builtin_name(enum udev_builtin_cmd cmd) {
return builtins[cmd]->name;
}
bool udev_builtin_run_once(enum udev_builtin_cmd cmd) {
bool udev_builtin_run_once(UdevBuiltinCommand cmd) {
assert(cmd >= 0 && cmd < _UDEV_BUILTIN_MAX);
if (!builtins[cmd])
@@ -93,8 +93,8 @@ bool udev_builtin_run_once(enum udev_builtin_cmd cmd) {
return builtins[cmd]->run_once;
}
enum udev_builtin_cmd udev_builtin_lookup(const char *command) {
enum udev_builtin_cmd i;
UdevBuiltinCommand udev_builtin_lookup(const char *command) {
UdevBuiltinCommand i;
size_t n;
assert(command);
@@ -108,7 +108,7 @@ enum udev_builtin_cmd udev_builtin_lookup(const char *command) {
return _UDEV_BUILTIN_INVALID;
}
int udev_builtin_run(sd_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test) {
int udev_builtin_run(sd_device *dev, UdevBuiltinCommand cmd, const char *command, bool test) {
_cleanup_strv_free_ char **argv = NULL;
assert(dev);

41
src/udev/udev-builtin.h
View File

@@ -5,7 +5,7 @@
#include "sd-device.h"
enum udev_builtin_cmd {
typedef enum {
#if HAVE_BLKID
UDEV_BUILTIN_BLKID,
#endif
@@ -25,9 +25,9 @@ enum udev_builtin_cmd {
#endif
_UDEV_BUILTIN_MAX,
_UDEV_BUILTIN_INVALID = -1,
};
} UdevBuiltinCommand;
struct udev_builtin {
typedef struct UdevBuiltin {
const char *name;
int (*cmd)(sd_device *dev, int argc, char *argv[], bool test);
const char *help;
@@ -35,32 +35,35 @@ struct udev_builtin {
void (*exit)(void);
bool (*validate)(void);
bool run_once;
};
} UdevBuiltin;
#define PTR_TO_UDEV_BUILTIN_CMD(p) ((UdevBuiltinCommand) ((intptr_t) (p)-1))
#define UDEV_BUILTIN_CMD_TO_PTR(u) ((void *) ((intptr_t) (u)+1))
#if HAVE_BLKID
extern const struct udev_builtin udev_builtin_blkid;
extern const UdevBuiltin udev_builtin_blkid;
#endif
extern const struct udev_builtin udev_builtin_btrfs;
extern const struct udev_builtin udev_builtin_hwdb;
extern const struct udev_builtin udev_builtin_input_id;
extern const struct udev_builtin udev_builtin_keyboard;
extern const UdevBuiltin udev_builtin_btrfs;
extern const UdevBuiltin udev_builtin_hwdb;
extern const UdevBuiltin udev_builtin_input_id;
extern const UdevBuiltin udev_builtin_keyboard;
#if HAVE_KMOD
extern const struct udev_builtin udev_builtin_kmod;
extern const UdevBuiltin udev_builtin_kmod;
#endif
extern const struct udev_builtin udev_builtin_net_id;
extern const struct udev_builtin udev_builtin_net_setup_link;
extern const struct udev_builtin udev_builtin_path_id;
extern const struct udev_builtin udev_builtin_usb_id;
extern const UdevBuiltin udev_builtin_net_id;
extern const UdevBuiltin udev_builtin_net_setup_link;
extern const UdevBuiltin udev_builtin_path_id;
extern const UdevBuiltin udev_builtin_usb_id;
#if HAVE_ACL
extern const struct udev_builtin udev_builtin_uaccess;
extern const UdevBuiltin udev_builtin_uaccess;
#endif
void udev_builtin_init(void);
void udev_builtin_exit(void);
enum udev_builtin_cmd udev_builtin_lookup(const char *command);
const char *udev_builtin_name(enum udev_builtin_cmd cmd);
bool udev_builtin_run_once(enum udev_builtin_cmd cmd);
int udev_builtin_run(sd_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test);
UdevBuiltinCommand udev_builtin_lookup(const char *command);
const char *udev_builtin_name(UdevBuiltinCommand cmd);
bool udev_builtin_run_once(UdevBuiltinCommand cmd);
int udev_builtin_run(sd_device *dev, UdevBuiltinCommand cmd, const char *command, bool test);
void udev_builtin_list(void);
bool udev_builtin_validate(void);
int udev_builtin_add_property(sd_device *dev, bool test, const char *key, const char *val);

50
src/udev/udev-event.c
View File

@@ -16,6 +16,7 @@
#include "device-private.h"
#include "device-util.h"
#include "fd-util.h"
#include "fs-util.h"
#include "format-util.h"
#include "libudev-util.h"
#include "netlink-util.h"
@@ -28,10 +29,11 @@
#include "strv.h"
#include "strxcpyx.h"
#include "udev-builtin.h"
#include "udev-event.h"
#include "udev-node.h"
#include "udev-util.h"
#include "udev-watch.h"
#include "udev.h"
#include "user-util.h"
typedef struct Spawn {
const char *cmd;
@@ -61,6 +63,9 @@ UdevEvent *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_netlink *rt
.birth_usec = now(CLOCK_MONOTONIC),
.exec_delay_usec = exec_delay_usec,
.rtnl = sd_netlink_ref(rtnl),
.uid = UID_INVALID,
.gid = GID_INVALID,
.mode = MODE_INVALID,
};
return event;
@@ -753,19 +758,23 @@ static int update_devnode(UdevEvent *event) {
if (event->dev_db_clone)
(void) udev_node_update_old_links(dev, event->dev_db_clone);
if (!event->owner_set) {
if (!uid_is_valid(event->uid)) {
r = device_get_devnode_uid(dev, &event->uid);
if (r < 0 && r != -ENOENT)
if (r == -ENOENT)
event->uid = 0;
else if (r < 0)
return log_device_error_errno(dev, r, "Failed to get devnode UID: %m");
}
if (!event->group_set) {
if (!gid_is_valid(event->gid)) {
r = device_get_devnode_gid(dev, &event->gid);
if (r < 0 && r != -ENOENT)
if (r == -ENOENT)
event->gid = 0;
else if (r < 0)
return log_device_error_errno(dev, r, "Failed to get devnode GID: %m");
}
if (!event->mode_set) {
if (event->mode == MODE_INVALID) {
r = device_get_devnode_mode(dev, &event->mode);
if (r < 0 && r != -ENOENT)
return log_device_error_errno(dev, r, "Failed to get devnode mode: %m");
@@ -779,7 +788,10 @@ static int update_devnode(UdevEvent *event) {
}
}
apply = device_for_action(dev, DEVICE_ACTION_ADD) || event->owner_set || event->group_set || event->mode_set;
apply = device_for_action(dev, DEVICE_ACTION_ADD) ||
uid_is_valid(event->uid) ||
gid_is_valid(event->gid) ||
event->mode != MODE_INVALID;
return udev_node_add(dev, apply, event->mode, event->uid, event->gid, event->seclabel_list);
}
@@ -900,22 +912,32 @@ void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec) {
const char *cmd;
void *val;
Iterator i;
int r;
ORDERED_HASHMAP_FOREACH_KEY(val, cmd, event->run_list, i) {
enum udev_builtin_cmd builtin_cmd = PTR_TO_INT(val);
UdevBuiltinCommand builtin_cmd = PTR_TO_UDEV_BUILTIN_CMD(val);
char command[UTIL_PATH_SIZE];
udev_event_apply_format(event, cmd, command, sizeof(command), false);
(void) udev_event_apply_format(event, cmd, command, sizeof(command), false);
if (builtin_cmd >= 0 && builtin_cmd < _UDEV_BUILTIN_MAX)
udev_builtin_run(event->dev, builtin_cmd, command, false);
else {
if (builtin_cmd != _UDEV_BUILTIN_INVALID) {
log_device_debug(event->dev, "Running built-in command \"%s\"", command);
r = udev_builtin_run(event->dev, builtin_cmd, command, false);
if (r < 0)
log_device_debug_errno(event->dev, r, "Failed to run built-in command \"%s\", ignoring: %m", command);
} else {
if (event->exec_delay_usec > 0) {
log_debug("delay execution of '%s'", command);
char buf[FORMAT_TIMESPAN_MAX];
log_device_debug(event->dev, "Delaying execution of \"%s\" for %s.",
command, format_timespan(buf, sizeof(buf), event->exec_delay_usec, USEC_PER_SEC));
(void) usleep(event->exec_delay_usec);
}
(void) udev_event_spawn(event, timeout_usec, false, command, NULL, 0);
log_device_debug(event->dev, "Running command \"%s\"", command);
r = udev_event_spawn(event, timeout_usec, false, command, NULL, 0);
if (r > 0) /* returned value is positive when program fails */
log_device_debug(event->dev, "Command \"%s\" returned %d (error), ignoring.", command, r);
}
}
}

46
src/udev/udev.h → src/udev/udev-event.h
View File

@@ -10,6 +10,7 @@
#include "hashmap.h"
#include "macro.h"
#include "udev-rules.h"
#include "udev-util.h"
#include "util.h"
@@ -32,38 +33,21 @@ typedef struct UdevEvent {
sd_netlink *rtnl;
unsigned builtin_run;
unsigned builtin_ret;
bool inotify_watch;
bool inotify_watch_final;
bool group_set;
bool group_final;
bool owner_set;
bool owner_final;
bool mode_set;
bool mode_final;
bool name_final;
bool devlink_final;
bool run_final;
UdevRuleEscapeType esc:8;
bool inotify_watch:1;
bool inotify_watch_final:1;
bool group_final:1;
bool owner_final:1;
bool mode_final:1;
bool name_final:1;
bool devlink_final:1;
bool run_final:1;
} UdevEvent;
/* udev-rules.c */
typedef struct UdevRules UdevRules;
int udev_rules_new(UdevRules **ret_rules, ResolveNameTiming resolve_name_timing);
UdevRules *udev_rules_free(UdevRules *rules);
bool udev_rules_check_timestamp(UdevRules *rules);
int udev_rules_apply_to_event(UdevRules *rules, UdevEvent *event,
usec_t timeout_usec,
Hashmap *properties_list);
int udev_rules_apply_static_dev_perms(UdevRules *rules);
static inline usec_t udev_warn_timeout(usec_t timeout_usec) {
return DIV_ROUND_UP(timeout_usec, 3);
}
/* udev-event.c */
UdevEvent *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_netlink *rtnl);
UdevEvent *udev_event_free(UdevEvent *event);
DEFINE_TRIVIAL_CLEANUP_FUNC(UdevEvent*, udev_event_free);
ssize_t udev_event_apply_format(UdevEvent *event,
const char *src, char *dest, size_t size,
bool replace_whitespace);
@@ -77,6 +61,6 @@ int udev_event_execute_rules(UdevEvent *event,
UdevRules *rules);
void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec);
/* Cleanup functions */
DEFINE_TRIVIAL_CLEANUP_FUNC(UdevEvent*, udev_event_free);
DEFINE_TRIVIAL_CLEANUP_FUNC(UdevRules*, udev_rules_free);
static inline usec_t udev_warn_timeout(usec_t timeout_usec) {
return DIV_ROUND_UP(timeout_usec, 3);
}

4228
src/udev/udev-rules.c
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More