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

Commit df3f38f6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents bc94667e a9451a5d

fs_mgr/README.overlayfs.md

+1 −1
Original line number Diff line number Diff line
@@ -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

fs_mgr/fs_mgr_overlayfs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs_mgr/tests/adb-remount-test.sh

+10 −13
Original line number Diff line number Diff line
@@ -577,18 +577,15 @@ 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 ||

        (

    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 &&

          false

        ) ||

        overlayfs_supported=false

        ;;

      *)

      echo "${GREEN}[       OK ]${NORMAL} overlay module uses callers creds" >&2

        echo "${GREEN}[       OK ]${NORMAL} overlay module uses caller's creds" >&2

        ;;

    esac

fi