ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Extend ueventd to use the label-by-symlink support in libselinux."

Browse source
This commit is contained in:
Nick Kralevich 2014-06-17 18:38:27 +00:00 • committed by Gerrit Code Review
commit 2af91ffb6c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
init/devices.c
View file

@ -196,7 +196,8 @@ static mode_t get_device_perm(const char *path, unsigned *uid, unsigned *gid)
static void make_device(const char *path, static void make_device(const char *path,
const char *upath UNUSED, const char *upath UNUSED,
int block, int major, int minor) int block, int major, int minor,
const char **links)
{ {
unsigned uid; unsigned uid;
unsigned gid; unsigned gid;
@ -207,7 +208,7 @@ static void make_device(const char *path,
mode = get_device_perm(path, &uid, &gid) | (block ? S_IFBLK : S_IFCHR); mode = get_device_perm(path, &uid, &gid) | (block ? S_IFBLK : S_IFCHR);
if (sehandle) { if (sehandle) {
selabel_lookup(sehandle, &secontext, path, mode); selabel_lookup_best_match(sehandle, &secontext, path, links, mode);
setfscreatecon(secontext); setfscreatecon(secontext);
} }
@ -523,7 +524,7 @@ static void handle_device(const char *action, const char *devpath,
int i; int i;
if(!strcmp(action, "add")) { if(!strcmp(action, "add")) {
make_device(devpath, path, block, major, minor); make_device(devpath, path, block, major, minor, (const char **)links);
if (links) { if (links) {
for (i = 0; links[i]; i++) for (i = 0; links[i]; i++)
make_link(devpath, links[i]); make_link(devpath, links[i]);