Skip to content

Commit

Permalink
Allow /sys/vm/watermark_scale_factor conflict -- seen on Freebox Play…
Browse files Browse the repository at this point in the history
…er Pop
  • Loading branch information
phhusson committed Jul 20, 2023
1 parent 1a18553 commit 24b3713
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions libsepol/cil/src/cil_post.c
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,15 @@ int cil_post_genfscon_context_compare(const void *a, const void *b)
*/
if(strcmp(a_genfscon->path_str, "/devices/virtual/block/") == 0)
bypass = 1;
/*
* This conflict has been seen on Freebox Player Pop
* - AOSP T says (genfscon proc "/sys/vm/watermark_scale_factor" (u object_r proc_watermark_scale_factor ((s0) (s0))))
* - stock rom says proc_vm_writable
*
* Stock ROM uses it only in recovery so it's safe to ignore
*/
if(strcmp(a_genfscon->path_str, "/sys/vm/watermark_scale_factor") == 0)
bypass = 1;
if(strcmp(a_genfscon->fs_str, "exfat") == 0 || strcmp(a_genfscon->fs_str, "esdfs") == 0) {
if(strcmp(a_genfscon->path_str, "/") == 0)
bypass = 1;
Expand Down

0 comments on commit 24b3713

Please sign in to comment.