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
@@ -32,6 +32,10 @@
|
||||
#include <glib/gprintf.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/fs.h>
|
||||
#include <ext2fs/ext2_fs.h>
|
||||
#ifdef HAVE_LINUX_FSVERITY_H
|
||||
#include <linux/fsverity.h>
|
||||
#endif
|
||||
|
||||
#include "otutil.h"
|
||||
#include "ostree.h"
|
||||
@@ -168,6 +172,113 @@ ot_security_smack_reset_fd (int fd)
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Wrapper around the fsverity ioctl, compressing the result to
|
||||
* "success, unsupported or error". This is used for /boot where
|
||||
* we enable verity if supported.
|
||||
* */
|
||||
gboolean
|
||||
_ostree_tmpf_fsverity_core (GLnxTmpfile *tmpf,
|
||||
_OstreeFeatureSupport fsverity_requested,
|
||||
gboolean *supported,
|
||||
GError **error)
|
||||
{
|
||||
/* Set this by default to simplify the code below */
|
||||
if (supported)
|
||||
*supported = FALSE;
|
||||
|
||||
if (fsverity_requested == _OSTREE_FEATURE_NO)
|
||||
return TRUE;
|
||||
|
||||
#ifdef HAVE_LINUX_FSVERITY_H
|
||||
GLNX_AUTO_PREFIX_ERROR ("fsverity", error);
|
||||
|
||||
/* fs-verity requires a read-only file descriptor */
|
||||
if (!glnx_tmpfile_reopen_rdonly (tmpf, error))
|
||||
return FALSE;
|
||||
|
||||
struct fsverity_enable_arg arg = { 0, };
|
||||
arg.version = 1;
|
||||
arg.hash_algorithm = FS_VERITY_HASH_ALG_SHA256; /* TODO configurable? */
|
||||
arg.block_size = 4096; /* FIXME query */
|
||||
arg.salt_size = 0; /* TODO store salt in ostree repo config */
|
||||
arg.salt_ptr = 0;
|
||||
arg.sig_size = 0; /* We don't currently expect use of in-kernel signature verification */
|
||||
arg.sig_ptr = 0;
|
||||
|
||||
if (ioctl (tmpf->fd, FS_IOC_ENABLE_VERITY, &arg) < 0)
|
||||
{
|
||||
switch (errno)
|
||||
{
|
||||
case ENOTTY:
|
||||
case EOPNOTSUPP:
|
||||
return TRUE;
|
||||
default:
|
||||
return glnx_throw_errno_prefix (error, "ioctl(FS_IOC_ENABLE_VERITY)");
|
||||
}
|
||||
}
|
||||
|
||||
if (supported)
|
||||
*supported = TRUE;
|
||||
#endif
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* Enable verity on a file, respecting the "wanted" and "supported" states.
|
||||
* The main idea here is to optimize out pointlessly calling the ioctl()
|
||||
* over and over in cases where it's not supported for the repo's filesystem,
|
||||
* as well as to support "opportunistic" use (requested and if filesystem supports).
|
||||
* */
|
||||
gboolean
|
||||
_ostree_tmpf_fsverity (OstreeRepo *self,
|
||||
GLnxTmpfile *tmpf,
|
||||
GError **error)
|
||||
{
|
||||
#ifdef HAVE_LINUX_FSVERITY_H
|
||||
g_mutex_lock (&self->txn_lock);
|
||||
_OstreeFeatureSupport fsverity_wanted = self->fs_verity_wanted;
|
||||
_OstreeFeatureSupport fsverity_supported = self->fs_verity_supported;
|
||||
g_mutex_unlock (&self->txn_lock);
|
||||
|
||||
switch (fsverity_wanted)
|
||||
{
|
||||
case _OSTREE_FEATURE_YES:
|
||||
{
|
||||
if (fsverity_supported == _OSTREE_FEATURE_NO)
|
||||
return glnx_throw (error, "fsverity required but filesystem does not support it");
|
||||
}
|
||||
break;
|
||||
case _OSTREE_FEATURE_MAYBE:
|
||||
break;
|
||||
case _OSTREE_FEATURE_NO:
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gboolean supported = FALSE;
|
||||
if (!_ostree_tmpf_fsverity_core (tmpf, fsverity_wanted, &supported, error))
|
||||
return FALSE;
|
||||
|
||||
if (!supported)
|
||||
{
|
||||
if (G_UNLIKELY (fsverity_wanted == _OSTREE_FEATURE_YES))
|
||||
return glnx_throw (error, "fsverity required but filesystem does not support it");
|
||||
|
||||
/* If we got here, we must be trying "opportunistic" use of fs-verity */
|
||||
g_assert_cmpint (fsverity_wanted, ==, _OSTREE_FEATURE_MAYBE);
|
||||
g_mutex_lock (&self->txn_lock);
|
||||
self->fs_verity_supported = _OSTREE_FEATURE_NO;
|
||||
g_mutex_unlock (&self->txn_lock);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
g_mutex_lock (&self->txn_lock);
|
||||
self->fs_verity_supported = _OSTREE_FEATURE_YES;
|
||||
g_mutex_unlock (&self->txn_lock);
|
||||
#else
|
||||
g_assert_cmpint (self->fs_verity_wanted, !=, _OSTREE_FEATURE_YES);
|
||||
#endif
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* Given an O_TMPFILE regular file, link it into place. */
|
||||
gboolean
|
||||
_ostree_repo_commit_tmpf_final (OstreeRepo *self,
|
||||
@@ -185,6 +296,9 @@ _ostree_repo_commit_tmpf_final (OstreeRepo *self,
|
||||
cancellable, error))
|
||||
return FALSE;
|
||||
|
||||
if (!_ostree_tmpf_fsverity (self, tmpf, error))
|
||||
return FALSE;
|
||||
|
||||
if (!glnx_link_tmpfile_at (tmpf, GLNX_LINK_TMPFILE_NOREPLACE_IGNORE_EXIST,
|
||||
dest_dfd, tmpbuf, error))
|
||||
return FALSE;
|
||||
|
||||
Reference in new issue
Block a user