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

reef: rgw/crypt: don't deref null manifest_bl #53590

Merged
merged 1 commit into from Oct 3, 2023
Merged

reef: rgw/crypt: don't deref null manifest_bl #53590

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/rgw/rgw_rest_s3.cc
View file
Open in desktop
Expand Up @@ -615,7 +615,7 @@ int RGWGetObj_ObjStore_S3::get_decrypt_filter(std::unique_ptr<RGWGetObj_Filter>
ldpp_dout(this, 1) << "failed to decode RGW_ATTR_CRYPT_PARTS" << dendl;
return -EIO;
}
} else {
} else if (manifest_bl) {
// otherwise, we read the part lengths from the manifest
res = RGWGetObj_BlockDecrypt::read_manifest_parts(this, *manifest_bl,
parts_len);
Expand Down Expand Up @@ -2788,7 +2788,7 @@ int RGWPutObj_ObjStore_S3::get_decrypt_filter(
ldpp_dout(this, 1) << "failed to decode RGW_ATTR_CRYPT_PARTS" << dendl;
return -EIO;
}
} else {
} else if (manifest_bl) {
// otherwise, we read the part lengths from the manifest
res = RGWGetObj_BlockDecrypt::read_manifest_parts(this, *manifest_bl,
parts_len);
Expand Down