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.

Sign up for GitHub

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

Jump to bottom

Properly release key in spa_keystore_dsl_key_hold_dd() #16567

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Properly release key in spa_keystore_dsl_key_hold_dd() #16567

merged 1 commit into from
Sep 25, 2024

Conversation

amotin
Copy link
Member

@amotin amotin commented Sep 24, 2024

Since dsl_crypto_key_open() references the key, 0d23f5e should have called dsl_crypto_key_rele() to drop it first instead of calling dsl_crypto_key_free() directly. The final result should actually be the same, but without triggering dck_holds assertion.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

@amotin
Properly release key in spa_keystore_dsl_key_hold_dd()
3bc485d 
Since dsl_crypto_key_open() references the key, 0d23f5e should
have called dsl_crypto_key_rele() to drop it first instead of
calling dsl_crypto_key_free() directly.  The final result should
actually be the same, but without triggering dck_holds assertion.

Signed-off-by:	Alexander Motin <mav@FreeBSD.org>
Sponsored by:	iXsystems, Inc.
@amotin amotin requested a review from behlendorf September 24, 2024 22:51
@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Sep 24, 2024
@behlendorf behlendorf merged commit 48d1be2 into openzfs:master Sep 25, 2024
15 of 20 checks passed
@amotin amotin deleted the key_hold branch September 25, 2024 15:52
ixhamza pushed a commit to truenas/zfs that referenced this pull request Nov 11, 2024
@amotin @ixhamza
Properly release key in spa_keystore_dsl_key_hold_dd()
e42b277 
Since dsl_crypto_key_open() references the key, 0d23f5e should
have called dsl_crypto_key_rele() to drop it first instead of
calling dsl_crypto_key_free() directly.  The final result should
actually be the same, but without triggering dck_holds assertion.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by:	Alexander Motin <mav@FreeBSD.org>
Sponsored by:	iXsystems, Inc.
Closes openzfs#16567
ptr1337 pushed a commit to CachyOS/zfs that referenced this pull request Nov 14, 2024
@amotin @tonyhutter
Properly release key in spa_keystore_dsl_key_hold_dd()
48482bb 
Since dsl_crypto_key_open() references the key, 0d23f5e should
have called dsl_crypto_key_rele() to drop it first instead of
calling dsl_crypto_key_free() directly.  The final result should
actually be the same, but without triggering dck_holds assertion.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by:	Alexander Motin <mav@FreeBSD.org>
Sponsored by:	iXsystems, Inc.
Closes openzfs#16567
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@behlendorf behlendorf behlendorf approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@amotin @behlendorf