Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcd6f0fb authored by Jakob Vukalović's avatar Jakob Vukalović Committed by Automerger Merge Worker
Browse files

Merge "ueventd: Fix creation of VFIO dev nodes" into main am: 998c3b4f 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2664635



Change-Id: I8c8cf82dcf4ec2195888faf4066ea457c2321a40
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3fbf1e39 998c3b4f

init/devices.cpp

+2 −0
Original line number Diff line number Diff line
@@ -568,6 +568,8 @@ void DeviceHandler::HandleUevent(const Uevent& uevent) { 
        return;

    } else if (uevent.subsystem == "misc" && StartsWith(uevent.device_name, "dm-user/")) {

        devpath = "/dev/dm-user/" + uevent.device_name.substr(8);

    } else if (uevent.subsystem == "misc" && uevent.device_name == "vfio/vfio") {

        devpath = "/dev/" + uevent.device_name;

    } else {

        devpath = "/dev/" + Basename(uevent.path);

    }

rootdir/ueventd.rc

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ subsystem sound 
subsystem dma_heap

   devname uevent_devpath

   dirname /dev/dma_heap



subsystem vfio

    devname uevent_devpath

    dirname /dev/vfio



# ueventd can only set permissions on device nodes and their associated

# sysfs attributes, not on arbitrary paths.

#
@@ -43,6 +48,7 @@ subsystem dma_heap 
/dev/binder               0666   root       root

/dev/hwbinder             0666   root       root

/dev/vndbinder            0666   root       root

/dev/vfio/*               0666   root       root



/dev/pmsg0                0222   root       log

/dev/dma_heap/system      0444   system     system