From: Eric Biggers <ebiggers@kernel.org>
To: Jes Sorensen <jes.sorensen@gmail.com>
Cc: linux-fscrypt@vger.kernel.org, kernel-team@fb.com,
Jes Sorensen <jsorensen@fb.com>
Subject: Re: [PATCH 5/9] Create libfsverity_compute_digest() and adapt cmd_sign to use it
Date: Sat, 21 Mar 2020 22:40:21 -0700 [thread overview]
Message-ID: <20200322054021.GI111151@sol.localdomain> (raw)
In-Reply-To: <20200312214758.343212-6-Jes.Sorensen@gmail.com>
On Thu, Mar 12, 2020 at 05:47:54PM -0400, Jes Sorensen wrote:
> @@ -608,16 +433,17 @@ int fsverity_cmd_sign(const struct fsverity_command *cmd,
> if (certfile == NULL)
> certfile = keyfile;
>
> - digest = xzalloc(sizeof(*digest) + hash_alg->digest_size);
> - memcpy(digest->magic, "FSVerity", 8);
> - digest->digest_algorithm = cpu_to_le16(hash_alg->hash_num);
> - digest->digest_size = cpu_to_le16(hash_alg->digest_size);
> -
> if (!open_file(&file, argv[0], O_RDONLY, 0))
> goto out_err;
>
> - if (!compute_file_measurement(file.fd, hash_alg, block_size,
> - salt, salt_size, digest->digest))
> + memset(¶ms, 0, sizeof(struct libfsverity_merkle_tree_params));
Please use 'sizeof(params)' in cases like this.
> + params.version = 1;
> + params.hash_algorithm = hash_alg->hash_num;
> + params.block_size = block_size;
> + params.salt_size = salt_size;
> + params.salt = salt;
> +
> + if (libfsverity_compute_digest(file.fd, ¶ms, &digest))
> goto out_err;
This doesn't close the file on error.
- Eric
next prev parent reply other threads:[~2020-03-22 5:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 21:47 [PATCH v3 0/9] Split fsverity-utils into a shared library Jes Sorensen
2020-03-12 21:47 ` [PATCH 1/9] Build basic shared library framework Jes Sorensen
2020-03-22 5:23 ` Eric Biggers
2020-03-22 5:33 ` Eric Biggers
2020-04-21 21:00 ` Jes Sorensen
2020-03-12 21:47 ` [PATCH 2/9] Change compute_file_measurement() to take a file descriptor as argument Jes Sorensen
2020-03-12 21:47 ` [PATCH 3/9] Move fsverity_descriptor definition to libfsverity.h Jes Sorensen
2020-03-22 4:57 ` Eric Biggers
2020-04-21 16:07 ` Jes Sorensen
2020-04-21 16:16 ` Eric Biggers
2020-04-21 16:20 ` Jes Sorensen
2020-03-12 21:47 ` [PATCH 4/9] Move hash algorithm code to shared library Jes Sorensen
2020-03-22 5:38 ` Eric Biggers
2020-04-22 17:57 ` Jes Sorensen
2020-03-12 21:47 ` [PATCH 5/9] Create libfsverity_compute_digest() and adapt cmd_sign to use it Jes Sorensen
2020-03-22 5:40 ` Eric Biggers [this message]
2020-03-12 21:47 ` [PATCH 6/9] Introduce libfsverity_sign_digest() Jes Sorensen
2020-03-12 21:47 ` [PATCH 7/9] Validate input arguments to libfsverity_compute_digest() Jes Sorensen
2020-03-12 21:47 ` [PATCH 8/9] Validate input parameters for libfsverity_sign_digest() Jes Sorensen
2020-03-22 5:27 ` Eric Biggers
2020-03-12 21:47 ` [PATCH 9/9] Document API of libfsverity Jes Sorensen
2020-03-22 5:54 ` Eric Biggers
2020-03-22 5:05 ` [PATCH v3 0/9] Split fsverity-utils into a shared library Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200322054021.GI111151@sol.localdomain \
--to=ebiggers@kernel.org \
--cc=jes.sorensen@gmail.com \
--cc=jsorensen@fb.com \
--cc=kernel-team@fb.com \
--cc=linux-fscrypt@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).