rimage: stop ignoring errors in parse_uuid() #8366
Merged
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
assert() that sscanf returns the expected value. Signed-off-by: Marc Herbert <[email protected]>
Fixes compilation failure with clang 15:
rimage/src/toml_utils.c:297:67: error: taking address of packed member
'd0' of class or structure 'uuid_t' may result in an unaligned pointer
value [-Werror,-Waddress-of-packed-member]
sscanf(buf, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", &id.d0,
^~~~
This also aligns indexes.
Signed-off-by: Marc Herbert <[email protected]>
Add missing `const` and warn that the endianness can't be relied on. Signed-off-by: Marc Herbert <[email protected]>
|
https://github.com/thesofproject/sof/actions/runs/6591943429/job/17911586211?pr=8366 has only DOS line endings warnings. Only one suspend/resume failure in ACE https://sof-ci.01.org/sofpr/PR8366/build13987/devicetest/index.html CAVS is all green https://sof-ci.01.org/sofpr/PR8366/build13988/devicetest/index.html |
marc-hb
requested review from
lgirdwood,
plbossart,
mmaka1,
lbetlej,
dbaluta and
kv2019i
as code owners
marc-hb
requested review from
lyakh,
RanderWang,
aiChaoSONG,
iuliana-prodan,
softwarecki and
pjdobrowolski
RanderWang
approved these changes
Oct 23, 2023
| * Parse UUID hex string into a byte array. The endianness of the output | ||
| * is architecture-dependent: do not use in any portable code. | ||
| */ | ||
| void parse_uuid(const char *buf, uint8_t *uuid); |
There was a problem hiding this comment.
Since Rimage is part of sof repository can we add ifdef condition for Intel adsp?
There was a problem hiding this comment.
Feel free to submit a follow-up PR after this one. This is one is just a minor clean-up.
softwarecki
approved these changes
Oct 23, 2023
lyakh
reviewed
Oct 23, 2023
tools/rimage/src/toml_utils.c
Outdated
| @@ -294,8 +295,12 @@ void parse_uuid(char *buf, uint8_t *uuid) | |||
| struct uuid_t id; | |||
| uint32_t d[10]; | |||
|
|
|||
| const int parsed_uuid_fields = | |||
| sscanf(buf, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", &id.d0, &d[0], | |||
| &d[1], &d[2], &d[3], &d[4], &d[5], &d[6], &d[7], &d[8], &d[9]); | |||
There was a problem hiding this comment.
would be good to indent this, e.g. as
const int parsed_uuid_fields = sscanf(buf,
"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
...
lyakh
approved these changes
Oct 23, 2023
lgirdwood
approved these changes
Oct 23, 2023
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.
3 commits.
Also fix compilation with clang 15
I checked that the MTL checksums are identical before/after these code changes.