Initial fs-verity support
Using fs-verity is natural for OSTree because it's file-based, as opposed to block based (like dm-verity). This only covers files - not symlinks or directories. And we clearly need to have integrity for the deployment directories at least. Also, what we likely need is an API that supports signing files as they're committed. So making this truly secure would need a lot more work. Nevertheless, I think it's time to start experimenting with it. Among other things, it does *finally* add an API that makes files immutable, which will help against some accidental damage. This is basic enablement work that is being driven by Fedora CoreOS; see also https://github.com/coreos/coreos-assembler/pull/876
This commit is contained in:
1 parent
570de2989c
commit
58fa579b1b
5 files changed
+237
-31
No files matched your search
@@ -41,6 +41,7 @@
|
||||
|
||||
#include "otutil.h"
|
||||
#include "ostree.h"
|
||||
#include "ostree-repo-private.h"
|
||||
#include "ostree-sysroot-private.h"
|
||||
#include "ostree-sepolicy-private.h"
|
||||
#include "ostree-bootloader-zipl.h"
|
||||
@@ -104,7 +105,8 @@ sysroot_flags_to_copy_flags (GLnxFileCopyFlags defaults,
|
||||
* hardlink if we're on the same partition.
|
||||
*/
|
||||
static gboolean
|
||||
install_into_boot (OstreeSePolicy *sepolicy,
|
||||
install_into_boot (OstreeRepo *repo,
|
||||
OstreeSePolicy *sepolicy,
|
||||
int src_dfd,
|
||||
const char *src_subpath,
|
||||
int dest_dfd,
|
||||
@@ -113,32 +115,67 @@ install_into_boot (OstreeSePolicy *sepolicy,
|
||||
GCancellable *cancellable,
|
||||
GError **error)
|
||||
{
|
||||
if (linkat (src_dfd, src_subpath, dest_dfd, dest_subpath, 0) != 0)
|
||||
{
|
||||
if (G_IN_SET (errno, EMLINK, EXDEV))
|
||||
{
|
||||
/* Be sure we relabel when copying the kernel, as in current
|
||||
* e.g. Fedora it might be labeled module_object_t or usr_t,
|
||||
* but policy may not allow other processes to read from that
|
||||
* like kdump.
|
||||
* See also https://github.com/fedora-selinux/selinux-policy/commit/747f4e6775d773ab74efae5aa37f3e5e7f0d4aca
|
||||
* This means we also drop xattrs but...I doubt anyone uses
|
||||
* non-SELinux xattrs for the kernel anyways aside from perhaps
|
||||
* IMA but that's its own story.
|
||||
*/
|
||||
g_auto(OstreeSepolicyFsCreatecon) fscreatecon = { 0, };
|
||||
const char *boot_path = glnx_strjoina ("/boot/", glnx_basename (dest_subpath));
|
||||
if (!_ostree_sepolicy_preparefscreatecon (&fscreatecon, sepolicy,
|
||||
boot_path, S_IFREG | 0644,
|
||||
error))
|
||||
return FALSE;
|
||||
return glnx_file_copy_at (src_dfd, src_subpath, NULL, dest_dfd, dest_subpath,
|
||||
GLNX_FILE_COPY_NOXATTRS | GLNX_FILE_COPY_DATASYNC,
|
||||
cancellable, error);
|
||||
}
|
||||
else
|
||||
return glnx_throw_errno_prefix (error, "linkat(%s)", dest_subpath);
|
||||
}
|
||||
if (linkat (src_dfd, src_subpath, dest_dfd, dest_subpath, 0) == 0)
|
||||
return TRUE; /* Note early return */
|
||||
if (!G_IN_SET (errno, EMLINK, EXDEV))
|
||||
return glnx_throw_errno_prefix (error, "linkat(%s)", dest_subpath);
|
||||
|
||||
/* Otherwise, copy */
|
||||
struct stat src_stbuf;
|
||||
if (!glnx_fstatat (src_dfd, src_subpath, &src_stbuf, AT_SYMLINK_NOFOLLOW, error))
|
||||
return FALSE;
|
||||
|
||||
glnx_autofd int src_fd = -1;
|
||||
if (!glnx_openat_rdonly (src_dfd, src_subpath, FALSE, &src_fd, error))
|
||||
return FALSE;
|
||||
|
||||
/* Be sure we relabel when copying the kernel, as in current
|
||||
* e.g. Fedora it might be labeled module_object_t or usr_t,
|
||||
* but policy may not allow other processes to read from that
|
||||
* like kdump.
|
||||
* See also https://github.com/fedora-selinux/selinux-policy/commit/747f4e6775d773ab74efae5aa37f3e5e7f0d4aca
|
||||
* This means we also drop xattrs but...I doubt anyone uses
|
||||
* non-SELinux xattrs for the kernel anyways aside from perhaps
|
||||
* IMA but that's its own story.
|
||||
*/
|
||||
g_auto(OstreeSepolicyFsCreatecon) fscreatecon = { 0, };
|
||||
const char *boot_path = glnx_strjoina ("/boot/", glnx_basename (dest_subpath));
|
||||
if (!_ostree_sepolicy_preparefscreatecon (&fscreatecon, sepolicy,
|
||||
boot_path, S_IFREG | 0644,
|
||||
error))
|
||||
return FALSE;
|
||||
|
||||
g_auto(GLnxTmpfile) tmp_dest = { 0, };
|
||||
if (!glnx_open_tmpfile_linkable_at (dest_dfd, ".", O_WRONLY | O_CLOEXEC,
|
||||
&tmp_dest, error))
|
||||
return FALSE;
|
||||
|
||||
if (glnx_regfile_copy_bytes (src_fd, tmp_dest.fd, (off_t) -1) < 0)
|
||||
return glnx_throw_errno_prefix (error, "regfile copy");
|
||||
|
||||
/* Kernel data should always be root-owned */
|
||||
if (fchown (tmp_dest.fd, src_stbuf.st_uid, src_stbuf.st_gid) != 0)
|
||||
return glnx_throw_errno_prefix (error, "fchown");
|
||||
|
||||
if (fchmod (tmp_dest.fd, src_stbuf.st_mode & 07777) != 0)
|
||||
return glnx_throw_errno_prefix (error, "fchmod");
|
||||
|
||||
if (fdatasync (tmp_dest.fd) < 0)
|
||||
return glnx_throw_errno_prefix (error, "fdatasync");
|
||||
|
||||
/* Today we don't have a config flag to *require* verity on /boot,
|
||||
* and at least for Fedora CoreOS we're not likely to do fsverity on
|
||||
* /boot soon due to wanting to support mounting it from old Linux
|
||||
* kernels. So change "required" to "maybe".
|
||||
*/
|
||||
_OstreeFeatureSupport boot_verity = _OSTREE_FEATURE_NO;
|
||||
if (repo->fs_verity_wanted != _OSTREE_FEATURE_NO)
|
||||
boot_verity = _OSTREE_FEATURE_MAYBE;
|
||||
if (!_ostree_tmpf_fsverity_core (&tmp_dest, boot_verity, NULL, error))
|
||||
return FALSE;
|
||||
|
||||
if (!glnx_link_tmpfile_at (&tmp_dest, GLNX_LINK_TMPFILE_NOREPLACE, dest_dfd, dest_subpath, error))
|
||||
return FALSE;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -1666,7 +1703,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
|
||||
return FALSE;
|
||||
if (errno == ENOENT)
|
||||
{
|
||||
if (!install_into_boot (sepolicy, kernel_layout->boot_dfd, kernel_layout->kernel_srcpath,
|
||||
if (!install_into_boot (repo, sepolicy, kernel_layout->boot_dfd, kernel_layout->kernel_srcpath,
|
||||
bootcsum_dfd, kernel_layout->kernel_namever,
|
||||
sysroot->debug_flags,
|
||||
cancellable, error))
|
||||
@@ -1683,7 +1720,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
|
||||
return FALSE;
|
||||
if (errno == ENOENT)
|
||||
{
|
||||
if (!install_into_boot (sepolicy, kernel_layout->boot_dfd, kernel_layout->initramfs_srcpath,
|
||||
if (!install_into_boot (repo, sepolicy, kernel_layout->boot_dfd, kernel_layout->initramfs_srcpath,
|
||||
bootcsum_dfd, kernel_layout->initramfs_namever,
|
||||
sysroot->debug_flags,
|
||||
cancellable, error))
|
||||
@@ -1698,7 +1735,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
|
||||
return FALSE;
|
||||
if (errno == ENOENT)
|
||||
{
|
||||
if (!install_into_boot (sepolicy, kernel_layout->boot_dfd, kernel_layout->devicetree_srcpath,
|
||||
if (!install_into_boot (repo, sepolicy, kernel_layout->boot_dfd, kernel_layout->devicetree_srcpath,
|
||||
bootcsum_dfd, kernel_layout->devicetree_namever,
|
||||
sysroot->debug_flags,
|
||||
cancellable, error))
|
||||
@@ -1712,7 +1749,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
|
||||
return FALSE;
|
||||
if (errno == ENOENT)
|
||||
{
|
||||
if (!install_into_boot (sepolicy, kernel_layout->boot_dfd, kernel_layout->kernel_hmac_srcpath,
|
||||
if (!install_into_boot (repo, sepolicy, kernel_layout->boot_dfd, kernel_layout->kernel_hmac_srcpath,
|
||||
bootcsum_dfd, kernel_layout->kernel_hmac_namever,
|
||||
sysroot->debug_flags,
|
||||
cancellable, error))
|
||||
|
||||
Reference in new issue
Block a user