From: Jes Sorensen <jes.sorensen@gmail.com>
To: linux-fscrypt@vger.kernel.org
Cc: kernel-team@fb.com, ebiggers@kernel.org, Jes Sorensen <jsorensen@fb.com>
Subject: [PATCH 7/9] Validate input arguments to libfsverity_compute_digest()
Date: Thu, 12 Mar 2020 17:47:56 -0400 [thread overview]
Message-ID: <20200312214758.343212-8-Jes.Sorensen@gmail.com> (raw)
In-Reply-To: <20200312214758.343212-1-Jes.Sorensen@gmail.com>
From: Jes Sorensen <jsorensen@fb.com>
If any argument is invalid, return -EINVAL. Similarly
if any of the reserved fields in the params struct
are set, return -EINVAL;
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---
libverity.c | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/libverity.c b/libverity.c
index 183259e..1cef544 100644
--- a/libverity.c
+++ b/libverity.c
@@ -155,9 +155,31 @@ libfsverity_compute_digest(int fd,
struct fsverity_descriptor desc;
struct stat stbuf;
u64 file_size;
- int retval = -EINVAL;
+ int i, retval = -EINVAL;
+
+ if (!digest_ret)
+ return -EINVAL;
+ if (params->version != 1)
+ return -EINVAL;
+ if (!is_power_of_2(params->block_size))
+ return -EINVAL;
+ if (params->salt_size > sizeof(desc.salt)) {
+ error_msg("Salt too long (got %u bytes; max is %zu bytes)",
+ params->salt_size, sizeof(desc.salt));
+ return -EINVAL;
+ }
+ if (params->salt_size && !params->salt)
+ return -EINVAL;
+ for (i = 0;
+ i < sizeof(params->reserved) / sizeof(params->reserved[0]); i++) {
+ if (params->reserved[i])
+ return -EINVAL;
+ }
hash_alg = libfsverity_find_hash_alg_by_num(params->hash_algorithm);
+ if (!hash_alg)
+ return -EINVAL;
+
hash = hash_alg->create_ctx(hash_alg);
digest = malloc(sizeof(struct libfsverity_digest) +
@@ -180,16 +202,9 @@ libfsverity_compute_digest(int fd,
desc.version = 1;
desc.hash_algorithm = params->hash_algorithm;
- ASSERT(is_power_of_2(params->block_size));
desc.log_blocksize = ilog2(params->block_size);
if (params->salt_size != 0) {
- if (params->salt_size > sizeof(desc.salt)) {
- error_msg("Salt too long (got %u bytes; max is %zu bytes)",
- params->salt_size, sizeof(desc.salt));
- retval = EINVAL;
- goto error_out;
- }
memcpy(desc.salt, params->salt, params->salt_size);
desc.salt_size = params->salt_size;
}
--
2.24.1
next prev parent reply other threads:[~2020-03-12 21:48 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
2020-03-12 21:47 ` [PATCH 6/9] Introduce libfsverity_sign_digest() Jes Sorensen
2020-03-12 21:47 ` Jes Sorensen [this message]
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=20200312214758.343212-8-Jes.Sorensen@gmail.com \
--to=jes.sorensen@gmail.com \
--cc=ebiggers@kernel.org \
--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