openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "fs_mgr: overlayfs: requires override_creds patch for 4.4+ kernels (taimen)"

This commit is contained in:
Treehugger Robot 2019-02-27 01:18:23 +00:00 committed by Gerrit Code Review
parent bc94667e8e a9451a5db1
commit df3f38f6c9
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs_mgr/README.overlayfs.md
View File

@ -94,7 +94,7 @@ Caveats
and thus free dynamic partition space.
- Kernel must have CONFIG_OVERLAY_FS=y and will need to be patched
with "*overlayfs: override_creds=off option bypass creator_cred*"
if kernel is higher than 4.6.
if kernel is 4.4 or higher.
The patch is available on the upstream mailing list and the latest as of
Feb 8 2019 is https://lore.kernel.org/patchwork/patch/1009299/.
This patch adds an override_creds _mount_ option to overlayfs that

2
fs_mgr/fs_mgr_overlayfs.cpp
View File

@ -1031,7 +1031,7 @@ OverlayfsValidResult fs_mgr_overlayfs_valid() {
if (major > 4) {
return OverlayfsValidResult::kNotSupported;
}
if (minor > 6) {
if (minor > 3) {
return OverlayfsValidResult::kNotSupported;
}
return OverlayfsValidResult::kOk;

23
fs_mgr/tests/adb-remount-test.sh
View File

@ -577,20 +577,17 @@ adb_sh ls -d /sys/module/overlay </dev/null >/dev/null 2>/dev/null ||
) ||
overlayfs_supported=false
if ${overlayfs_supported}; then
case `adb_sh uname -r </dev/null` in
4.[6789].* | 4.[1-9][0-9]* | [56789].*)
adb_su ls /sys/module/overlay/parameters/override_creds </dev/null >/dev/null &&
echo "${GREEN}[ OK ]${NORMAL} overlay module supports override_creds" >&2 ||
(
echo "${ORANGE}[ WARNING ]${NORMAL} overlay module does not support override_creds" >&2 &&
false
) ||
adb_su ls /sys/module/overlay/parameters/override_creds </dev/null >/dev/null &&
echo "${GREEN}[ OK ]${NORMAL} overlay module supports override_creds" >&2 ||
case `adb_sh uname -r </dev/null` in
4.[456789].* | 4.[1-9][0-9]* | [56789].*)
echo "${ORANGE}[ WARNING ]${NORMAL} overlay module does not support override_creds" >&2 &&
overlayfs_supported=false
;;
*)
echo "${GREEN}[ OK ]${NORMAL} overlay module uses callers creds" >&2
;;
esac
;;
*)
echo "${GREEN}[ OK ]${NORMAL} overlay module uses caller's creds" >&2
;;
esac
fi
adb_root ||