Honda: fix alt brake address check race condition #1723
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
1 task
…g with 0x296 is safe
sshane
commented
Nov 21, 2023
Comment on lines
398
to
+414
| safety_config ret; | ||
| if (honda_bosch_radarless && honda_alt_brake_msg) { | ||
| SET_RX_CHECKS(honda_common_alt_brake_rx_checks, ret); | ||
| } else if (honda_bosch_radarless) { | ||
| SET_RX_CHECKS(honda_common_rx_checks, ret); | ||
| } else if (honda_alt_brake_msg) { | ||
| SET_RX_CHECKS(honda_bosch_alt_brake_rx_checks, ret); | ||
| } else { | ||
| SET_RX_CHECKS(honda_bosch_rx_checks, ret); | ||
| } | ||
|
|
||
| if (honda_bosch_radarless) { | ||
| ret = honda_bosch_long ? BUILD_SAFETY_CFG(honda_common_rx_checks, HONDA_RADARLESS_LONG_TX_MSGS) : \ | ||
| BUILD_SAFETY_CFG(honda_common_rx_checks, HONDA_RADARLESS_TX_MSGS); | ||
| honda_bosch_long ? SET_TX_MSGS(HONDA_RADARLESS_LONG_TX_MSGS, ret) : \ | ||
| SET_TX_MSGS(HONDA_RADARLESS_TX_MSGS, ret); | ||
| } else { | ||
| ret = honda_bosch_long ? BUILD_SAFETY_CFG(honda_bosch_rx_checks, HONDA_BOSCH_LONG_TX_MSGS) : \ | ||
| BUILD_SAFETY_CFG(honda_bosch_rx_checks, HONDA_BOSCH_TX_MSGS); | ||
| honda_bosch_long ? SET_TX_MSGS(HONDA_BOSCH_LONG_TX_MSGS, ret) : \ | ||
| SET_TX_MSGS(HONDA_BOSCH_TX_MSGS, ret); |
There was a problem hiding this comment.
@adeebshihadeh is setting the rx/tx messages piecemeal okay? If not the if statement block would be pretty large since the refactor. We can use BUILD_SAFETY_CFG if we store the count again, but needs the old macro and addr struct anyway
There was a problem hiding this comment.
yeah, let's just make it clean
sshane
force-pushed
the
honda-fix-alt-brake
branch
from
4a0282d to
5091068
Compare
This was referenced Nov 21, 2023
adeebshihadeh
added a commit
that referenced
this pull request
Nov 25, 2023
This reverts commit 42a6293.
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.
Caught by commaai/openpilot#30443. Should just make the rx hook not consider the address if it's not in our set of addresses. Right now it's totally ignoring either the powertrain data msg, or the brake module msg depending on which it sees first.
This PR uses the safety param to add the addr check.
PR to add true whitelisting: #1732