On 5/15/20 12:10 AM, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
>
> From the 'fsverity' program, split out a library 'libfsverity'.
> Currently it supports computing file measurements ("digests"), and
> signing those file measurements for use with the fs-verity builtin
> signature verification feature.
>
> Rewritten from patches by Jes Sorensen <jsorensen@xxxxxx>.
> I made a lot of improvements, e.g.:
>
> - Separated library and program source into different directories.
> - Drastically improved the Makefile.
> - Added 'make check' target and rules to build test programs.
> - In the shared lib, only export the functions intended to be public.
> - Prefixed global functions with "libfsverity_" so that they don't cause
> conflicts when the library is built as a static library.
> - Made library error messages be sent to a user-specified callback
> rather than always be printed to stderr.
> - Keep showing OpenSSL error messages.
> - Stopped abort()ing in library code, when possible.
> - Made libfsverity_digest use native endianness.
> - Moved file_size into the merkle_tree_params.
> - Made libfsverity_hash_name() just return the static strings.
> - Made some variables in the API uint32_t instead of uint16_t.
> - Shared parse_hash_alg_option() between cmd_enable and cmd_sign.
> - Lots of fixes.
>
> Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
Eric,
Here is a more detailed review. The code as we have it seems to work for
me, but there are some issues that I think would be right to address:
I appreciate that you improved the error return values from the original
true/false/assert handling.
As much as I hate typedefs, I also like the introduction of
libfsverity_read_fn_t as function pointers are somewhat annoying to deal
with.
My biggest objection is the export of kernel datatypes to userland and I
really don't think using u32/u16/u8 internally in the library adds any
value. I had explicitly converted it to uint32_t/uint16_t/uint8_t in my
version.
max() defined in common/utils.h is not used by anything, so lets get rid
of it.
I also wonder if we should introduce an
libfsverity_get_digest_size(alg_nr) function? It would be useful for a
caller trying to allocate buffers to store them in, to be able to do
this prior to calculating the first digest.
> diff --git a/lib/compute_digest.c b/lib/compute_digest.c
> index b279d63..13998bb 100644
> --- a/lib/compute_digest.c
> +++ b/lib/compute_digest.c
> @@ -1,13 +1,13 @@
... snip ...
> -const struct fsverity_hash_alg *find_hash_alg_by_name(const char *name)
> +LIBEXPORT u32
> +libfsverity_find_hash_alg_by_name(const char *name)
This export of u32 here is problematic.
> diff --git a/lib/sign_digest.c b/lib/sign_digest.c
> index d2b0d53..d856392 100644
> --- a/lib/sign_digest.c
> +++ b/lib/sign_digest.c
> @@ -1,45 +1,68 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * sign_digest.c
> + * Implementation of libfsverity_sign_digest().
> *
> * Copyright (C) 2018 Google LLC
> + * Copyright (C) 2020 Facebook
> */
>
> -#include "hash_algs.h"
> -#include "sign.h"
> +#include "lib_private.h"
>
> #include <limits.h>
> #include <openssl/bio.h>
> #include <openssl/err.h>
> #include <openssl/pem.h>
> #include <openssl/pkcs7.h>
> +#include <string.h>
> +
> +/*
> + * Format in which verity file measurements are signed. This is the same as
> + * 'struct fsverity_digest', except here some magic bytes are prepended to
> + * provide some context about what is being signed in case the same key is used
> + * for non-fsverity purposes, and here the fields have fixed endianness.
> + */
> +struct fsverity_signed_digest {
> + char magic[8]; /* must be "FSVerity" */
> + __le16 digest_algorithm;
> + __le16 digest_size;
> + __u8 digest[];
> +};
I don't really understand why you prefer to manage two versions of the
digest, ie. libfsverity_digest and libfsverity_signed_digest, but it's
not a big deal.
> diff --git a/lib/utils.c b/lib/utils.c
> new file mode 100644
> index 0000000..0684526
> --- /dev/null
> +++ b/lib/utils.c
> @@ -0,0 +1,107 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Utility functions for libfsverity
> + *
> + * Copyright 2020 Google LLC
> + */
> +
> +#define _GNU_SOURCE /* for asprintf() */
> +
> +#include "lib_private.h"
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
> +
> +static void *xmalloc(size_t size)
> +{
> + void *p = malloc(size);
> +
> + if (!p)
> + libfsverity_error_msg("out of memory");
> + return p;
> +}
> +
> +void *libfsverity_zalloc(size_t size)
> +{
> + void *p = xmalloc(size);
> +
> + if (!p)
> + return NULL;
> + return memset(p, 0, size);
> +}
I suggest we get rid of xmalloc() and libfsverity_zalloc(). libc
provides perfectly good malloc() and calloc() functions, and printing an
out of memory error in a generic location doesn't tell us where the
error happened. If anything those error messages should be printed by
the calling function IMO.
Reviewed-by: Jes Sorensen <jsorensen@xxxxxx>
Cheers,
Jes
|