fix: validate req_size in cert erasetrusted#445
Open
MarkAtwood wants to merge 1 commit into
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot couldn't run its full agentic review because no GitHub Actions runner was available. Make sure your repository has a runner available to run Copilot's review, or add a copilot-setup-steps.yml file specifying one with the runs-on attribute. See the docs for more details.
Adds request-size validation for the WH_MESSAGE_CERT_ACTION_ERASETRUSTED handler to prevent acting on undersized/tainted request data.
Changes:
- Add minimum
req_sizeguard before translating/usingEraseTrustedRequest - Return
WH_ERROR_BADARGSvia simple response when the request packet is too small
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+935
to
+941
| if (req_size < sizeof(req)) { | ||
| resp.rc = WH_ERROR_BADARGS; | ||
| wh_MessageCert_TranslateSimpleResponse( | ||
| magic, &resp, (whMessageCert_SimpleResponse*)resp_packet); | ||
| *out_resp_size = sizeof(resp); | ||
| break; | ||
| } |
This file contains hidden or 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
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.
Bug
In
wh_Server_HandleCertRequest(src/wh_server_cert.c), theWH_MESSAGE_CERT_ACTION_ERASETRUSTEDcase callswh_MessageCert_TranslateEraseTrustedRequestand thenwh_Server_CertEraseTrusted(server, req.id)without first validating thatreq_size >= sizeof(req). It is the lone outlier among the cert handlers: ADDTRUSTED, VERIFY, and the DMA handlers all guard request size before translating. An undersized request packet leavesreq.idpopulated from stale/attacker-influenced buffer bytes, which can erase the wrong trusted NVM object. Data-integrity issue (the fixed-size translate reads within the comm buffer, so no out-of-bounds access).Fix
Add a minimum-size check at the top of the ERASETRUSTED case, mirroring the existing ADDTRUSTED handler: on
req_size < sizeof(req), setresp.rc = WH_ERROR_BADARGS, emit the simple response, and break. ~9 lines, no API change.Verification
Compiled the translation unit against a prebuilt wolfSSL install with the cert-manager + server config (
-DWOLFHSM_CFG_CERTIFICATE_MANAGER -DWOLFHSM_CFG_ENABLE_SERVER); builds clean (exit 0).Reported by static analysis (Fenrir finding 267).