diff options
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/2lib/2api.c | 4 | ||||
| -rw-r--r-- | firmware/2lib/2common.c | 6 | ||||
| -rw-r--r-- | firmware/2lib/include/2common.h | 9 | ||||
| -rw-r--r-- | firmware/2lib/include/2struct.h | 19 | ||||
| -rw-r--r-- | firmware/lib20/api.c | 35 | ||||
| -rw-r--r-- | firmware/lib20/api_kernel.c | 39 | ||||
| -rw-r--r-- | firmware/lib20/kernel.c | 26 | ||||
| -rw-r--r-- | firmware/lib20/misc.c | 20 | ||||
| -rw-r--r-- | firmware/lib21/api.c | 22 | ||||
| -rw-r--r-- | firmware/lib21/misc.c | 24 |
10 files changed, 108 insertions, 96 deletions
diff --git a/firmware/2lib/2api.c b/firmware/2lib/2api.c index f39ba290..e6ed5eb0 100644 --- a/firmware/2lib/2api.c +++ b/firmware/2lib/2api.c @@ -165,10 +165,10 @@ vb2_error_t vb2api_extend_hash(struct vb2_context *ctx, { struct vb2_shared_data *sd = vb2_get_sd(ctx); struct vb2_digest_context *dc = (struct vb2_digest_context *) - (ctx->workbuf + sd->workbuf_hash_offset); + vb2_member_of(sd, sd->hash_offset); /* Must have initialized hash digest work area */ - if (!sd->workbuf_hash_size) + if (!sd->hash_size) return VB2_ERROR_API_EXTEND_HASH_WORKBUF; /* Don't extend past the data we expect to hash */ diff --git a/firmware/2lib/2common.c b/firmware/2lib/2common.c index de1fc498..c0eb4479 100644 --- a/firmware/2lib/2common.c +++ b/firmware/2lib/2common.c @@ -104,6 +104,12 @@ ptrdiff_t vb2_offset_of(const void *base, const void *ptr) return (uintptr_t)ptr - (uintptr_t)base; } +void *vb2_member_of(void *parent, ptrdiff_t offset) +{ + /* TODO(kitching): vb2_assert(parent && offset) */ + return parent + offset; +} + vb2_error_t vb2_verify_member_inside(const void *parent, size_t parent_size, const void *member, size_t member_size, ptrdiff_t member_data_offset, diff --git a/firmware/2lib/include/2common.h b/firmware/2lib/include/2common.h index f0df9c0b..ccc0bfc4 100644 --- a/firmware/2lib/include/2common.h +++ b/firmware/2lib/include/2common.h @@ -166,6 +166,15 @@ vb2_error_t vb2_align(uint8_t **ptr, uint32_t *size, uint32_t align, ptrdiff_t vb2_offset_of(const void *base, const void *ptr); /** + * Return member of given object. + * + * @param parent Pointer to parent object + * @param offset Offset from base + * @return Pointer to child object. + */ +void *vb2_member_of(void *parent, ptrdiff_t offset); + +/** * Return expected signature size for a signature/hash algorithm pair * * @param sig_alg Signature algorithm diff --git a/firmware/2lib/include/2struct.h b/firmware/2lib/include/2struct.h index 52783b6a..a045fef3 100644 --- a/firmware/2lib/include/2struct.h +++ b/firmware/2lib/include/2struct.h @@ -169,22 +169,22 @@ struct vb2_shared_data { * Offset and size of packed data key in work buffer. Size is 0 if * data key is not stored in the work buffer. */ - uint32_t workbuf_data_key_offset; - uint32_t workbuf_data_key_size; + uint32_t data_key_offset; + uint32_t data_key_size; /* * Offset and size of firmware preamble in work buffer. Size is 0 if * preamble is not stored in the work buffer. */ - uint32_t workbuf_preamble_offset; - uint32_t workbuf_preamble_size; + uint32_t preamble_offset; + uint32_t preamble_size; /* * Offset and size of hash context in work buffer. Size is 0 if * hash context is not stored in the work buffer. */ - uint32_t workbuf_hash_offset; - uint32_t workbuf_hash_size; + uint32_t hash_offset; + uint32_t hash_size; /* * Current tag we're hashing @@ -192,8 +192,7 @@ struct vb2_shared_data { * For new structs, this is the offset of the vb2_signature struct * in the work buffer. * - * TODO: rename to workbuf_hash_sig_offset when vboot1 structs are - * deprecated. + * TODO: rename to hash_sig_offset when vboot1 structs are deprecated. */ uint32_t hash_tag; @@ -222,8 +221,8 @@ struct vb2_shared_data { * subkey is not stored in the work buffer. Note that kernel key may * be inside the firmware preamble. */ - uint32_t workbuf_kernel_key_offset; - uint32_t workbuf_kernel_key_size; + uint32_t kernel_key_offset; + uint32_t kernel_key_size; } __attribute__((packed)); /****************************************************************************/ diff --git a/firmware/lib20/api.c b/firmware/lib20/api.c index 7c6b0d46..e28b168e 100644 --- a/firmware/lib20/api.c +++ b/firmware/lib20/api.c @@ -52,19 +52,19 @@ vb2_error_t vb2api_init_hash(struct vb2_context *ctx, uint32_t tag, return VB2_ERROR_API_INIT_HASH_TAG; /* Get preamble pointer */ - if (!sd->workbuf_preamble_size) + if (!sd->preamble_size) return VB2_ERROR_API_INIT_HASH_PREAMBLE; pre = (const struct vb2_fw_preamble *) - (ctx->workbuf + sd->workbuf_preamble_offset); + vb2_member_of(sd, sd->preamble_offset); /* For now, we only support the firmware body tag */ if (tag != VB2_HASH_TAG_FW_BODY) return VB2_ERROR_API_INIT_HASH_TAG; /* Allocate workbuf space for the hash */ - if (sd->workbuf_hash_size) { + if (sd->hash_size) { dc = (struct vb2_digest_context *) - (ctx->workbuf + sd->workbuf_hash_offset); + vb2_member_of(sd, sd->hash_offset); } else { uint32_t dig_size = sizeof(*dc); @@ -72,9 +72,9 @@ vb2_error_t vb2api_init_hash(struct vb2_context *ctx, uint32_t tag, if (!dc) return VB2_ERROR_API_INIT_HASH_WORKBUF; - sd->workbuf_hash_offset = vb2_offset_of(ctx->workbuf, dc); - sd->workbuf_hash_size = dig_size; - vb2_set_workbuf_used(ctx, sd->workbuf_hash_offset + dig_size); + sd->hash_offset = vb2_offset_of(sd, dc); + sd->hash_size = dig_size; + vb2_set_workbuf_used(ctx, sd->hash_offset + dig_size); } /* @@ -94,12 +94,12 @@ vb2_error_t vb2api_init_hash(struct vb2_context *ctx, uint32_t tag, * the firmware preamble. But until we can change the signing scripts, * we're stuck with a signature here instead of a hash. */ - if (!sd->workbuf_data_key_size) + if (!sd->data_key_size) return VB2_ERROR_API_INIT_HASH_DATA_KEY; rv = vb2_unpack_key_buffer(&key, - ctx->workbuf + sd->workbuf_data_key_offset, - sd->workbuf_data_key_size); + vb2_member_of(sd, sd->data_key_offset), + sd->data_key_size); if (rv) return rv; @@ -136,7 +136,7 @@ vb2_error_t vb2api_check_hash_get_digest(struct vb2_context *ctx, { struct vb2_shared_data *sd = vb2_get_sd(ctx); struct vb2_digest_context *dc = (struct vb2_digest_context *) - (ctx->workbuf + sd->workbuf_hash_offset); + vb2_member_of(sd, sd->hash_offset); struct vb2_workbuf wb; uint8_t *digest; @@ -149,13 +149,12 @@ vb2_error_t vb2api_check_hash_get_digest(struct vb2_context *ctx, vb2_workbuf_from_ctx(ctx, &wb); /* Get preamble pointer */ - if (!sd->workbuf_preamble_size) + if (!sd->preamble_size) return VB2_ERROR_API_CHECK_HASH_PREAMBLE; - pre = (struct vb2_fw_preamble *) - (ctx->workbuf + sd->workbuf_preamble_offset); + pre = vb2_member_of(sd, sd->preamble_offset); /* Must have initialized hash digest work area */ - if (!sd->workbuf_hash_size) + if (!sd->hash_size) return VB2_ERROR_API_CHECK_HASH_WORKBUF; /* Should have hashed the right amount of data */ @@ -185,12 +184,12 @@ vb2_error_t vb2api_check_hash_get_digest(struct vb2_context *ctx, */ /* Unpack the data key */ - if (!sd->workbuf_data_key_size) + if (!sd->data_key_size) return VB2_ERROR_API_CHECK_HASH_DATA_KEY; rv = vb2_unpack_key_buffer(&key, - ctx->workbuf + sd->workbuf_data_key_offset, - sd->workbuf_data_key_size); + vb2_member_of(sd, sd->data_key_offset), + sd->data_key_size); if (rv) return rv; diff --git a/firmware/lib20/api_kernel.c b/firmware/lib20/api_kernel.c index 8e5f5e61..7737f260 100644 --- a/firmware/lib20/api_kernel.c +++ b/firmware/lib20/api_kernel.c @@ -74,19 +74,18 @@ vb2_error_t vb2api_kernel_phase1(struct vb2_context *ctx) if (rv) return rv; - sd->workbuf_kernel_key_offset = - vb2_offset_of(ctx->workbuf, key_data); + sd->kernel_key_offset = vb2_offset_of(sd, key_data); } else { /* Kernel subkey from firmware preamble */ struct vb2_fw_preamble *pre; struct vb2_packed_key *pre_key, *packed_key; /* Make sure we have a firmware preamble loaded */ - if (!sd->workbuf_preamble_size) + if (!sd->preamble_size) return VB2_ERROR_API_KPHASE1_PREAMBLE; pre = (struct vb2_fw_preamble *) - (ctx->workbuf + sd->workbuf_preamble_offset); + vb2_member_of(sd, sd->preamble_offset); pre_key = &pre->kernel_subkey; /* @@ -94,8 +93,8 @@ vb2_error_t vb2api_kernel_phase1(struct vb2_context *ctx) * data key, firmware preamble, or hash data. So move the * kernel key from the preamble down after the shared data. */ - sd->workbuf_kernel_key_offset = vb2_wb_round_up(sizeof(*sd)); - key_data = ctx->workbuf + sd->workbuf_kernel_key_offset; + sd->kernel_key_offset = vb2_wb_round_up(sizeof(*sd)); + key_data = vb2_member_of(sd, sd->kernel_key_offset); packed_key = (struct vb2_packed_key *)key_data; memmove(packed_key, pre_key, sizeof(*packed_key)); packed_key->key_offset = sizeof(*packed_key); @@ -107,9 +106,9 @@ vb2_error_t vb2api_kernel_phase1(struct vb2_context *ctx) } /* Firmware stage structs are no longer present */ - sd->workbuf_data_key_size = 0; - sd->workbuf_preamble_size = 0; - sd->workbuf_hash_size = 0; + sd->data_key_size = 0; + sd->preamble_size = 0; + sd->hash_size = 0; /* * Kernel key will persist in the workbuf after we return. @@ -118,9 +117,9 @@ vb2_error_t vb2api_kernel_phase1(struct vb2_context *ctx) * - vb2_shared_data * - kernel key */ - sd->workbuf_kernel_key_size = key_size; - vb2_set_workbuf_used(ctx, sd->workbuf_kernel_key_offset + - sd->workbuf_kernel_key_size); + sd->kernel_key_size = key_size; + vb2_set_workbuf_used(ctx, sd->kernel_key_offset + + sd->kernel_key_size); return VB2_SUCCESS; } @@ -149,16 +148,16 @@ vb2_error_t vb2api_get_kernel_size(struct vb2_context *ctx, const struct vb2_kernel_preamble *pre; /* Get preamble pointer */ - if (!sd->workbuf_preamble_size) + if (!sd->preamble_size) return VB2_ERROR_API_GET_KERNEL_SIZE_PREAMBLE; pre = (const struct vb2_kernel_preamble *) - (ctx->workbuf + sd->workbuf_preamble_offset); + vb2_member_of(sd, sd->preamble_offset); if (offset_ptr) { /* The kernel implicitly follows the preamble */ *offset_ptr = sd->vblock_preamble_offset + - sd->workbuf_preamble_size; + sd->preamble_size; } if (size_ptr) { @@ -186,11 +185,11 @@ vb2_error_t vb2api_verify_kernel_data(struct vb2_context *ctx, const void *buf, vb2_workbuf_from_ctx(ctx, &wb); /* Get preamble pointer */ - if (!sd->workbuf_preamble_size) + if (!sd->preamble_size) return VB2_ERROR_API_VERIFY_KDATA_PREAMBLE; pre = (struct vb2_kernel_preamble *) - (ctx->workbuf + sd->workbuf_preamble_offset); + vb2_member_of(sd, sd->preamble_offset); /* Make sure we were passed the right amount of data */ if (size != pre->body_signature.data_size) @@ -210,12 +209,12 @@ vb2_error_t vb2api_verify_kernel_data(struct vb2_context *ctx, const void *buf, * the kernel preamble. But until we can change the signing scripts, * we're stuck with a signature here instead of a hash. */ - if (!sd->workbuf_data_key_size) + if (!sd->data_key_size) return VB2_ERROR_API_VERIFY_KDATA_KEY; rv = vb2_unpack_key_buffer(&key, - ctx->workbuf + sd->workbuf_data_key_offset, - sd->workbuf_data_key_size); + vb2_member_of(sd, sd->data_key_offset), + sd->data_key_size); if (rv) return rv; diff --git a/firmware/lib20/kernel.c b/firmware/lib20/kernel.c index 4d8f7721..10cf158f 100644 --- a/firmware/lib20/kernel.c +++ b/firmware/lib20/kernel.c @@ -121,8 +121,8 @@ vb2_error_t vb2_load_kernel_keyblock(struct vb2_context *ctx) sd->flags &= ~VB2_SD_FLAG_KERNEL_SIGNED; /* Unpack the kernel key */ - key_data = ctx->workbuf + sd->workbuf_kernel_key_offset; - key_size = sd->workbuf_kernel_key_size; + key_data = vb2_member_of(sd, sd->kernel_key_offset); + key_size = sd->kernel_key_size; rv = vb2_unpack_key_buffer(&kernel_key, key_data, key_size); if (rv) return rv; @@ -217,8 +217,8 @@ vb2_error_t vb2_load_kernel_keyblock(struct vb2_context *ctx) * (which we might still need to verify the next kernel, if the * assoiciated kernel preamble and data don't verify). */ - sd->workbuf_data_key_offset = ctx->workbuf_used; - key_data = ctx->workbuf + sd->workbuf_data_key_offset; + sd->data_key_offset = ctx->workbuf_used; + key_data = vb2_member_of(sd, sd->data_key_offset); packed_key = (struct vb2_packed_key *)key_data; memmove(packed_key, &kb->data_key, sizeof(*packed_key)); packed_key->key_offset = sizeof(*packed_key); @@ -227,7 +227,7 @@ vb2_error_t vb2_load_kernel_keyblock(struct vb2_context *ctx) packed_key->key_size); /* Save the packed key size */ - sd->workbuf_data_key_size = + sd->data_key_size = packed_key->key_offset + packed_key->key_size; /* @@ -238,8 +238,8 @@ vb2_error_t vb2_load_kernel_keyblock(struct vb2_context *ctx) * - kernel key * - packed kernel data key */ - vb2_set_workbuf_used(ctx, sd->workbuf_data_key_offset + - sd->workbuf_data_key_size); + vb2_set_workbuf_used(ctx, sd->data_key_offset + + sd->data_key_size); return VB2_SUCCESS; } @@ -357,8 +357,8 @@ vb2_error_t vb2_load_kernel_preamble(struct vb2_context *ctx) struct vb2_shared_data *sd = vb2_get_sd(ctx); struct vb2_workbuf wb; - uint8_t *key_data = ctx->workbuf + sd->workbuf_data_key_offset; - uint32_t key_size = sd->workbuf_data_key_size; + uint8_t *key_data = vb2_member_of(sd, sd->data_key_offset); + uint32_t key_size = sd->data_key_size; struct vb2_public_key data_key; /* Preamble goes in the next unused chunk of work buffer */ @@ -372,7 +372,7 @@ vb2_error_t vb2_load_kernel_preamble(struct vb2_context *ctx) vb2_workbuf_from_ctx(ctx, &wb); /* Unpack the kernel data key */ - if (!sd->workbuf_data_key_size) + if (!sd->data_key_size) return VB2_ERROR_KERNEL_PREAMBLE2_DATA_KEY; rv = vb2_unpack_key_buffer(&data_key, key_data, key_size); @@ -431,8 +431,8 @@ vb2_error_t vb2_load_kernel_preamble(struct vb2_context *ctx) return VB2_ERROR_KERNEL_PREAMBLE_VERSION_ROLLBACK; /* Keep track of where we put the preamble */ - sd->workbuf_preamble_offset = vb2_offset_of(ctx->workbuf, pre); - sd->workbuf_preamble_size = pre_size; + sd->preamble_offset = vb2_offset_of(sd, pre); + sd->preamble_size = pre_size; /* * Preamble will persist in work buffer after we return. @@ -447,7 +447,7 @@ vb2_error_t vb2_load_kernel_preamble(struct vb2_context *ctx) * TODO: we could move the preamble down over the kernel data key * since we don't need it anymore. */ - vb2_set_workbuf_used(ctx, sd->workbuf_preamble_offset + pre_size); + vb2_set_workbuf_used(ctx, sd->preamble_offset + pre_size); return VB2_SUCCESS; } diff --git a/firmware/lib20/misc.c b/firmware/lib20/misc.c index 70f3ab80..0d681799 100644 --- a/firmware/lib20/misc.c +++ b/firmware/lib20/misc.c @@ -172,8 +172,8 @@ vb2_error_t vb2_load_fw_keyblock(struct vb2_context *ctx) packed_key->key_size); /* Save the packed key offset and size */ - sd->workbuf_data_key_offset = vb2_offset_of(ctx->workbuf, key_data); - sd->workbuf_data_key_size = + sd->data_key_offset = vb2_offset_of(sd, key_data); + sd->data_key_size = packed_key->key_offset + packed_key->key_size; /* Preamble follows the keyblock in the vblock */ @@ -186,8 +186,8 @@ vb2_error_t vb2_load_fw_keyblock(struct vb2_context *ctx) * - vb2_shared_data * - packed firmware data key */ - vb2_set_workbuf_used(ctx, sd->workbuf_data_key_offset + - sd->workbuf_data_key_size); + vb2_set_workbuf_used(ctx, sd->data_key_offset + + sd->data_key_size); return VB2_SUCCESS; } @@ -198,8 +198,8 @@ vb2_error_t vb2_load_fw_preamble(struct vb2_context *ctx) struct vb2_gbb_header *gbb = vb2_get_gbb(ctx); struct vb2_workbuf wb; - uint8_t *key_data = ctx->workbuf + sd->workbuf_data_key_offset; - uint32_t key_size = sd->workbuf_data_key_size; + uint8_t *key_data = vb2_member_of(sd, sd->data_key_offset); + uint32_t key_size = sd->data_key_size; struct vb2_public_key data_key; /* Preamble goes in the next unused chunk of work buffer */ @@ -211,7 +211,7 @@ vb2_error_t vb2_load_fw_preamble(struct vb2_context *ctx) vb2_workbuf_from_ctx(ctx, &wb); /* Unpack the firmware data key */ - if (!sd->workbuf_data_key_size) + if (!sd->data_key_size) return VB2_ERROR_FW_PREAMBLE2_DATA_KEY; rv = vb2_unpack_key_buffer(&data_key, key_data, key_size); @@ -292,8 +292,8 @@ vb2_error_t vb2_load_fw_preamble(struct vb2_context *ctx) } /* Keep track of where we put the preamble */ - sd->workbuf_preamble_offset = vb2_offset_of(ctx->workbuf, pre); - sd->workbuf_preamble_size = pre_size; + sd->preamble_offset = vb2_offset_of(sd, pre); + sd->preamble_size = pre_size; /* * Preamble will persist in work buffer after we return. @@ -307,7 +307,7 @@ vb2_error_t vb2_load_fw_preamble(struct vb2_context *ctx) * TODO: we could move the preamble down over the firmware data key * since we don't need it anymore. */ - vb2_set_workbuf_used(ctx, sd->workbuf_preamble_offset + pre_size); + vb2_set_workbuf_used(ctx, sd->preamble_offset + pre_size); return VB2_SUCCESS; } diff --git a/firmware/lib21/api.c b/firmware/lib21/api.c index 59448695..d9a955e7 100644 --- a/firmware/lib21/api.c +++ b/firmware/lib21/api.c @@ -52,10 +52,10 @@ vb2_error_t vb21api_init_hash(struct vb2_context *ctx, vb2_workbuf_from_ctx(ctx, &wb); /* Get preamble pointer */ - if (!sd->workbuf_preamble_size) + if (!sd->preamble_size) return VB2_ERROR_API_INIT_HASH_PREAMBLE; pre = (const struct vb21_fw_preamble *) - (ctx->workbuf + sd->workbuf_preamble_offset); + vb2_member_of(sd, sd->preamble_offset); /* Find the matching signature */ hash_offset = pre->hash_offset; @@ -72,9 +72,9 @@ vb2_error_t vb21api_init_hash(struct vb2_context *ctx, return VB2_ERROR_API_INIT_HASH_ID; /* No match */ /* Allocate workbuf space for the hash */ - if (sd->workbuf_hash_size) { + if (sd->hash_size) { dc = (struct vb2_digest_context *) - (ctx->workbuf + sd->workbuf_hash_offset); + vb2_member_of(sd, sd->hash_offset); } else { uint32_t dig_size = sizeof(*dc); @@ -82,12 +82,12 @@ vb2_error_t vb21api_init_hash(struct vb2_context *ctx, if (!dc) return VB2_ERROR_API_INIT_HASH_WORKBUF; - sd->workbuf_hash_offset = vb2_offset_of(ctx->workbuf, dc); - sd->workbuf_hash_size = dig_size; - vb2_set_workbuf_used(ctx, sd->workbuf_hash_offset + dig_size); + sd->hash_offset = vb2_offset_of(sd, dc); + sd->hash_size = dig_size; + vb2_set_workbuf_used(ctx, sd->hash_offset + dig_size); } - sd->hash_tag = vb2_offset_of(ctx->workbuf, sig); + sd->hash_tag = vb2_offset_of(sd, sig); sd->hash_remaining_size = sig->data_size; if (size) @@ -117,7 +117,7 @@ vb2_error_t vb21api_check_hash(struct vb2_context *ctx) { struct vb2_shared_data *sd = vb2_get_sd(ctx); struct vb2_digest_context *dc = (struct vb2_digest_context *) - (ctx->workbuf + sd->workbuf_hash_offset); + vb2_member_of(sd, sd->hash_offset); struct vb2_workbuf wb; uint8_t *digest; @@ -132,10 +132,10 @@ vb2_error_t vb21api_check_hash(struct vb2_context *ctx) /* Get signature pointer */ if (!sd->hash_tag) return VB2_ERROR_API_CHECK_HASH_TAG; - sig = (const struct vb21_signature *)(ctx->workbuf + sd->hash_tag); + sig = vb2_member_of(sd, sd->hash_tag); /* Must have initialized hash digest work area */ - if (!sd->workbuf_hash_size) + if (!sd->hash_size) return VB2_ERROR_API_CHECK_HASH_WORKBUF; /* Should have hashed the right amount of data */ diff --git a/firmware/lib21/misc.c b/firmware/lib21/misc.c index de7d4477..96071685 100644 --- a/firmware/lib21/misc.c +++ b/firmware/lib21/misc.c @@ -145,12 +145,12 @@ vb2_error_t vb21_load_fw_keyblock(struct vb2_context *ctx) packed_key = (struct vb21_packed_key *)key_data; /* Save the packed key offset and size */ - sd->workbuf_data_key_offset = vb2_offset_of(ctx->workbuf, key_data); - sd->workbuf_data_key_size = packed_key->c.total_size; + sd->data_key_offset = vb2_offset_of(sd, key_data); + sd->data_key_size = packed_key->c.total_size; /* Data key will persist in the workbuf after we return */ - vb2_set_workbuf_used(ctx, sd->workbuf_data_key_offset + - sd->workbuf_data_key_size); + vb2_set_workbuf_used(ctx, sd->data_key_offset + + sd->data_key_size); return VB2_SUCCESS; } @@ -161,8 +161,8 @@ vb2_error_t vb21_load_fw_preamble(struct vb2_context *ctx) struct vb2_gbb_header *gbb = vb2_get_gbb(ctx); struct vb2_workbuf wb; - uint8_t *key_data = ctx->workbuf + sd->workbuf_data_key_offset; - uint32_t key_size = sd->workbuf_data_key_size; + uint8_t *key_data = vb2_member_of(sd, sd->data_key_offset); + uint32_t key_size = sd->data_key_size; struct vb2_public_key data_key; /* Preamble goes in the next unused chunk of work buffer */ @@ -173,7 +173,7 @@ vb2_error_t vb21_load_fw_preamble(struct vb2_context *ctx) vb2_workbuf_from_ctx(ctx, &wb); /* Unpack the firmware data key */ - if (!sd->workbuf_data_key_size) + if (!sd->data_key_size) return VB2_ERROR_FW_PREAMBLE2_DATA_KEY; rv = vb21_unpack_key(&data_key, key_data, key_size); @@ -201,7 +201,7 @@ vb2_error_t vb21_load_fw_preamble(struct vb2_context *ctx) pre = (struct vb21_fw_preamble *)key_data; /* Data key is now gone */ - sd->workbuf_data_key_offset = sd->workbuf_data_key_size = 0; + sd->data_key_offset = sd->data_key_size = 0; /* * Firmware version is the lower 16 bits of the composite firmware @@ -238,12 +238,12 @@ vb2_error_t vb21_load_fw_preamble(struct vb2_context *ctx) } /* Keep track of where we put the preamble */ - sd->workbuf_preamble_offset = vb2_offset_of(ctx->workbuf, pre); - sd->workbuf_preamble_size = pre->c.total_size; + sd->preamble_offset = vb2_offset_of(sd, pre); + sd->preamble_size = pre->c.total_size; /* Preamble will persist in work buffer after we return */ - vb2_set_workbuf_used(ctx, sd->workbuf_preamble_offset + - sd->workbuf_preamble_size); + vb2_set_workbuf_used(ctx, sd->preamble_offset + + sd->preamble_size); return VB2_SUCCESS; } |