drgreen/android_device_google_gs-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "zumasystemdlkm" into udc-d1-dev

Browse Source 
* changes:
  insmod: Add support to load kernel modules from /system/lib/modules
  Allow insmod-sh to install kernel modules from system_dlkm
This commit is contained in:
TreeHugger Robot 2023-03-18 05:48:44 +00:00 committed by Android (Google) Code Review
commit 86fdd03b13
3 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
insmod/init.common.cfg
View File

@ -6,6 +6,7 @@
# Load common kernel modules
# Modules here will be loaded *before* device specific modules
modprobe|-b *
modprobe|system -b *
modprobe|vendor -b *
# All common modules loaded
setprop|vendor.common.modules.ready

48
insmod/insmod.sh
View File

@ -8,16 +8,29 @@
#############################################################
modules_dir=
system_modules_dir=
vendor_modules_dir=
for f in /vendor/lib/modules/*/modules.dep /vendor/lib/modules/modules.dep; do
if [[ -f "$f" ]]; then
modules_dir="$(dirname "$f")"
break
fi
for dir in system vendor; do
for f in /${dir}/lib/modules/*/modules.dep /${dir}/lib/modules/modules.dep; do
if [[ -f "$f" ]]; then
if [[ "${dir}" == "system" ]]; then
system_modules_dir="$(dirname "$f")"
else
vendor_modules_dir="$(dirname "$f")"
modules_dir=${vendor_modules_dir}
fi
break
fi
done
done
if [[ -z "${modules_dir}" ]]; then
echo "Unable to locate kernel modules directory" 2>&1
if [[ -z "${system_modules_dir}" ]]; then
echo "Unable to locate system kernel modules directory" 2>&1
fi
if [[ -z "${vendor_modules_dir}" ]]; then
echo "Unable to locate vendor kernel modules directory" 2>&1
exit 1
fi
@ -55,12 +68,23 @@ if [ -f $cfg_file ]; then
"enable") echo 1 > $arg ;;
"modprobe")
case ${arg} in
"-b *" | "-b")
arg="-b --all=${modules_dir}/modules.load" ;;
"*" | "")
arg="--all=${modules_dir}/modules.load" ;;
"system -b *" | "system -b")
modules_dir=${system_modules_dir}
arg="-b --all=${system_modules_dir}/modules.load" ;;
"system *" | "system")
modules_dir=${system_modules_dir}
arg="--all=${system_modules_dir}/modules.load" ;;
"-b *" | "-b" | "vendor -b *" | "vendor -b")
modules_dir=${vendor_modules_dir}
arg="-b --all=${vendor_modules_dir}/modules.load" ;;
"*" | "" | "vendor *" | "vendor")
modules_dir=${vendor_modules_dir}
arg="--all=${vendor_modules_dir}/modules.load" ;;
esac
modprobe -a -d "${modules_dir}" $arg ;;
if [[ -d "${modules_dir}" ]]; then
modprobe -a -d "${modules_dir}" $arg
fi
;;
"wait") wait_for_file $arg ;;
esac
done < $cfg_file

3
insmod/sepolicy/insmod-sh.te
View File

@ -3,6 +3,9 @@ type insmod-sh_exec, vendor_file_type, exec_type, file_type;
init_daemon_domain(insmod-sh)
allow insmod-sh self:capability sys_module;
allow insmod-sh system_dlkm_file:dir r_dir_perms;
allow insmod-sh system_dlkm_file:file r_file_perms;
allow insmod-sh system_dlkm_file:system module_load;
allow insmod-sh vendor_kernel_modules:system module_load;
allow insmod-sh vendor_toolbox_exec:file execute_no_trans;