Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(x/distribution): vulnerable incrementReferenceCount in distribution #19301

Merged
merged 9 commits into from
Feb 7, 2024

Conversation

knkcse
Copy link
Contributor

@knkcse knkcse commented Jan 31, 2024

Description

Closes: #7609


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • reviewed "Files changed" and left comments if necessary
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • updated the relevant documentation or specification, including comments for documenting Go code
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage

Summary by CodeRabbit

  • Bug Fixes
    • Fixed a vulnerability in the distribution module by adjusting the control flow in the incrementReferenceCount function to correctly manage reference counts.

@knkcse knkcse requested a review from a team as a code owner January 31, 2024 06:52
@github-actions github-actions bot added the C:x/distribution distribution module related label Jan 31, 2024
Copy link
Contributor

coderabbitai bot commented Jan 31, 2024

Walkthrough

The modification to the incrementReferenceCount function within the validator.go file of the Cosmos SDK's distribution module implements a critical update to enforce a maximum reference count of 2. By incrementing the ReferenceCount before checking if it exceeds the limit and introducing a panic if this condition is met, the change aims to address a specific vulnerability related to the management of reference counts.

Changes

File Path Change Summary
x/distribution/keeper/validator.go Incremented ReferenceCount before checking the limit; added panic if the count exceeds 2.

Assessment against linked issues

Objective Addressed Explanation
Modify the incrementReferenceCount function to ensure the reference count never exceeds 2. (#7609)
Update the function to include a check that triggers a panic if the reference count exceeds 2. (#7609)
Implement changes in validator.go at line 69. (#7609) The exact line number cannot be verified without the context of the file version, but the change seems to align with the specified requirement.

Related issues

  • [Bug]: Distribution Invariant #17529: This issue raises a concern about the order of operations in the incrementReferenceCount function and suggests that incrementing the count before checking the limit would be more logical. The changes in this PR directly address the suggestion made in this issue, indicating that it could be linked to the PR for a comprehensive solution to the identified vulnerability.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit-tests for this file.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit tests for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

@@ -124,10 +124,11 @@ func (k Keeper) incrementReferenceCount(ctx context.Context, valAddr sdk.ValAddr
if err != nil {
return err
}

historical.ReferenceCount++
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The implementation of the panic condition when the reference count exceeds 2 in the incrementReferenceCount function aligns with the PR's objective to mitigate the identified vulnerability. However, this approach introduces a hard stop in the execution flow, which could lead to unhandled panics in production. Consider implementing a more graceful error handling mechanism that allows the calling function to manage the error, enhancing the robustness of the system.

Comment on lines 124 to 134
if err != nil {
return err
}

historical.ReferenceCount++
if historical.ReferenceCount > 2 {
panic("reference count should never exceed 2")
}
historical.ReferenceCount++
return k.ValidatorHistoricalRewards.Set(ctx, collections.Join(valAddr, period), historical)
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 NOTE
This review was outside the diff hunks, and no overlapping diff hunk was found. Original lines [198-204]

The call to incrementReferenceCount within updateValidatorSlashFraction does not account for the potential panic introduced by the new logic in incrementReferenceCount. This oversight could lead to unhandled exceptions during slashing events. It's crucial to wrap this call in a try-catch or equivalent error handling structure to prevent crashes and ensure the system's resilience.

Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain the rationale behind change?

@julienrbrt julienrbrt changed the title fix: vulnerable incrementReferenceCount in distribution fix(x/distribution): vulnerable incrementReferenceCount in distribution Feb 1, 2024
@knkcse
Copy link
Contributor Author

knkcse commented Feb 2, 2024

Can you explain the rationale behind change?

In the original code, the reference count is checked first. If it exceeds the limit of 2, a panic is triggered. However, if the count is exactly 2, it will still be incremented before the panic occurs. This means that the count could potentially become 3, violating the intended constraint. By swapping the order of operations, the fixed code ensures that the reference count is properly checked and incremented without compromising intended logic and constraints

@alexanderbez
Copy link
Contributor

Makes sense. @naveenkumarcse2018 we need a changelog entry for the bug fix. Then we can merge. Thank you!!

@julienrbrt
Copy link
Member

ping @naveenkumarcse2018 about the changelog

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review Status

Actionable comments generated: 1

Configuration used: .coderabbit.yml

Commits Files that changed from the base of the PR and between 0580ff9 and 6194378.
Files selected for processing (1)
  • x/distribution/CHANGELOG.md (1 hunks)


### Bug Fixes

* [#19301](https://github.com/cosmos/cosmos-sdk/pull/19301) Fix vulnerability in `incrementReferenceCount` in distribution.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changelog entry for the bug fix is correctly formatted, follows the guiding principles, and includes the appropriate PR link. However, it lacks detail about the nature of the vulnerability and how it was fixed. Consider adding a brief description of the vulnerability and the fix applied for better clarity.

@knkcse
Copy link
Contributor Author

knkcse commented Feb 6, 2024

updated the changelog @julienrbrt @alexanderbez

@julienrbrt julienrbrt added this pull request to the merge queue Feb 7, 2024
Merged via the queue into cosmos:main with commit 4b8f326 Feb 7, 2024
55 of 57 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:x/distribution distribution module related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

vulnerable incrementReferenceCount in distribution
4 participants