Skip to content

Commit

Permalink
prepare-root: Disallow hotfixes if using signed composefs images
Browse files Browse the repository at this point in the history
As mentioned in #3187, we
can't allow a hotfix overlay of /usr when using signed composefs
images as that would allow an attacker to persist something used
across boots.
  • Loading branch information
alexlarsson committed Feb 22, 2024
1 parent 8f98143 commit 41fd55a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/switchroot/ostree-prepare-root.c
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,10 @@ main (int argc, char *argv[])
* with ostree admin unlock --hotfix.
* Note however that root.transient as handled above is effectively a generalization of unlock
* --hotfix.
* Also, hotfixes are incompatible with signed composefs use for security reasons.
*/
if (lstat (OTCORE_HOTFIX_USR_OVL_WORK, &stbuf) == 0)
if (lstat (OTCORE_HOTFIX_USR_OVL_WORK, &stbuf) == 0
&& !(using_composefs && composefs_config->is_signed))
{
/* Do we have a persistent overlayfs for /usr? If so, mount it now. */
const char usr_ovl_options[]
Expand Down

0 comments on commit 41fd55a

Please sign in to comment.