COIL: Change sane to inclusive words
BUG=b:163883397 BRANCH=None TEST=make runtests TEST=egrep -r -i -I '(sane|insane)' Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Change-Id: I109207575e2c00d6aa3b0ed17de7f699087a9658 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2369464 Reviewed-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
parent
f573cf6669
commit
1166a2fa50
2
Makefile
2
Makefile
|
@ -87,7 +87,7 @@ _machname := $(shell uname -m)
|
||||||
HOST_ARCH ?= ${_machname}
|
HOST_ARCH ?= ${_machname}
|
||||||
|
|
||||||
# ARCH and/or FIRMWARE_ARCH are defined by the Chromium OS ebuild.
|
# ARCH and/or FIRMWARE_ARCH are defined by the Chromium OS ebuild.
|
||||||
# Pick a sane target architecture if none is defined.
|
# Pick a valid target architecture if none is defined.
|
||||||
ifeq (${ARCH},)
|
ifeq (${ARCH},)
|
||||||
ARCH := ${HOST_ARCH}
|
ARCH := ${HOST_ARCH}
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -250,7 +250,7 @@ vb2_error_t vb2_check_keyblock(const struct vb2_keyblock *block, uint32_t size,
|
||||||
return VB2_ERROR_KEYBLOCK_SIG_OUTSIDE;
|
return VB2_ERROR_KEYBLOCK_SIG_OUTSIDE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Make sure advertised signature data sizes are sane. */
|
/* Make sure advertised signature data sizes are valid. */
|
||||||
if (block->keyblock_size < sig->data_size) {
|
if (block->keyblock_size < sig->data_size) {
|
||||||
VB2_DEBUG("Signature calculated past end of block\n");
|
VB2_DEBUG("Signature calculated past end of block\n");
|
||||||
return VB2_ERROR_KEYBLOCK_SIGNED_TOO_MUCH;
|
return VB2_ERROR_KEYBLOCK_SIGNED_TOO_MUCH;
|
||||||
|
@ -335,7 +335,7 @@ vb2_error_t vb2_verify_fw_preamble(struct vb2_fw_preamble *preamble,
|
||||||
return VB2_ERROR_PREAMBLE_SIG_OUTSIDE;
|
return VB2_ERROR_PREAMBLE_SIG_OUTSIDE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Make sure advertised signature data sizes are sane. */
|
/* Make sure advertised signature data sizes are valid. */
|
||||||
if (preamble->preamble_size < sig->data_size) {
|
if (preamble->preamble_size < sig->data_size) {
|
||||||
VB2_DEBUG("Signature calculated past end of the block\n");
|
VB2_DEBUG("Signature calculated past end of the block\n");
|
||||||
return VB2_ERROR_PREAMBLE_SIGNED_TOO_MUCH;
|
return VB2_ERROR_PREAMBLE_SIGNED_TOO_MUCH;
|
||||||
|
|
|
@ -85,7 +85,7 @@ enum {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Verify GptData parameters are sane.
|
* Verify GptData parameters are valid.
|
||||||
*/
|
*/
|
||||||
int CheckParameters(GptData* gpt);
|
int CheckParameters(GptData* gpt);
|
||||||
|
|
||||||
|
|
|
@ -265,7 +265,7 @@ vb2_error_t vb2_verify_kernel_preamble(struct vb2_kernel_preamble *preamble,
|
||||||
return VB2_ERROR_PREAMBLE_SIG_OUTSIDE;
|
return VB2_ERROR_PREAMBLE_SIG_OUTSIDE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Make sure advertised signature data sizes are sane. */
|
/* Make sure advertised signature data sizes are valid. */
|
||||||
if (preamble->preamble_size < sig->data_size) {
|
if (preamble->preamble_size < sig->data_size) {
|
||||||
VB2_DEBUG("Signature calculated past end of the block\n");
|
VB2_DEBUG("Signature calculated past end of the block\n");
|
||||||
return VB2_ERROR_PREAMBLE_SIGNED_TOO_MUCH;
|
return VB2_ERROR_PREAMBLE_SIGNED_TOO_MUCH;
|
||||||
|
|
|
@ -99,7 +99,7 @@ vb2_error_t vb2_load_fw_keyblock(struct vb2_context *ctx)
|
||||||
VB2_TRY(vb2_verify_packed_key_inside(kb, block_size, &kb->data_key));
|
VB2_TRY(vb2_verify_packed_key_inside(kb, block_size, &kb->data_key));
|
||||||
|
|
||||||
/* Save the future offset and size while kb->data_key is still valid.
|
/* Save the future offset and size while kb->data_key is still valid.
|
||||||
The check above made sure that key_offset and key_size are sane. */
|
The check above made sure that key_offset and key_size are valid. */
|
||||||
sd->data_key_offset = vb2_offset_of(sd, key_data);
|
sd->data_key_offset = vb2_offset_of(sd, key_data);
|
||||||
sd->data_key_size = kb->data_key.key_offset + kb->data_key.key_size;
|
sd->data_key_size = kb->data_key.key_offset + kb->data_key.key_size;
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,7 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
|
||||||
}
|
}
|
||||||
memcpy(¶ms, data, sizeof(params));
|
memcpy(¶ms, data, sizeof(params));
|
||||||
|
|
||||||
// Enforce a sane sector size. The sector size must accommodate the GPT
|
// Enforce a valid sector size. The sector size must accommodate the GPT
|
||||||
// header (the code assumes this) and large values don't make sense
|
// header (the code assumes this) and large values don't make sense
|
||||||
// either (both in terms of actual hardware parameters and ability for
|
// either (both in terms of actual hardware parameters and ability for
|
||||||
// the fuzzer to deal with effectively).
|
// the fuzzer to deal with effectively).
|
||||||
|
|
|
@ -859,7 +859,7 @@ static int ValidityCheckTest(void)
|
||||||
GptEntry *e1 = (GptEntry *)gpt->primary_entries;
|
GptEntry *e1 = (GptEntry *)gpt->primary_entries;
|
||||||
uint8_t *tempptr;
|
uint8_t *tempptr;
|
||||||
|
|
||||||
/* Unmodified test data is completely sane */
|
/* Unmodified test data is completely valid. */
|
||||||
BuildTestGptData(gpt);
|
BuildTestGptData(gpt);
|
||||||
EXPECT(GPT_SUCCESS == GptValidityCheck(gpt));
|
EXPECT(GPT_SUCCESS == GptValidityCheck(gpt));
|
||||||
EXPECT(MASK_BOTH == gpt->valid_headers);
|
EXPECT(MASK_BOTH == gpt->valid_headers);
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
dummy
|
dummy
|
||||||
master
|
master
|
||||||
sane
|
|
||||||
slave
|
slave
|
Loading…
Reference in New Issue