qualifying data as hex string or binary file and manpage fix #1822
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
williamcroberts
commented
Oct 29, 2019
| } | ||
| } | ||
|
|
||
| TPM2B_NONCE policy_qualifier = { .size = (uint16_t) file_size }; |
There was a problem hiding this comment.
@idesai this code is wrong, and broken. file_size is a long, which can hold a value larger than 16 bits. You could be reading only partial files as you cast it done without checking that it is not larger than UINT16_MAX.
Additionally, this code was over complicated... all you need to do is:
- set a size to the max size of the buffer
- call files_load_bytes_from_path(), which will read up to max bytes and error out if the file hasn't been fully consumed as well as update the size parameter to the actual size in bytes read.
- go on your way using the contents, validate size if your expecting something certain.
williamcroberts
commented
Oct 29, 2019
| return tool_rc_general_error; | ||
| } | ||
|
|
||
| *policy_qualifier = malloc(file_size + sizeof(uint16_t)); |
There was a problem hiding this comment.
@idesai this code is wild.
- if you need to malloc a TPM2B_* data type, just malloc based on the sizeof of the type. We're not counting the few bytes it wastes.
- Why did you even malloc it? There was no point in complicating the flow with needing to free and dealing with oom. Just stack allocate and pass a pointer, which is funny, as a lot of the other parameter structures worked like that.
This comment has been minimized.
This comment has been minimized.
Codecov Report
@@ Coverage Diff @@
## master #1822 +/- ##
==========================================
+ Coverage 74.39% 74.53% +0.13%
==========================================
Files 115 115
Lines 11553 11501 -52
==========================================
- Hits 8595 8572 -23
+ Misses 2958 2929 -29
Continue to review full report at Codecov.
|
williamcroberts
force-pushed
the
qualifying-data
branch
from
5f5f013
to
1f49ace
Compare
added 2 commits
October 29, 2019 13:51
Unify the -q option by allowing them to be a file or hex array for inputs. Fixes: tpm2-software#1631 Signed-off-by: William Roberts <william.c.roberts@intel.com>
tpm2_nvextend was identical to tpm2_nvsetbits due to a copy + paste error. Correct the manpage by making it reflect the tpm2_nvextend tool. Fixes: tpm2-software#1820 Signed-off-by: William Roberts <william.c.roberts@intel.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #1631
Fixes: #1820