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

ECAL - Fix heap-buffer overflows reported by ASAN - 140x #44304

Merged
merged 1 commit into from
Mar 6, 2024
Merged

ECAL - Fix heap-buffer overflows reported by ASAN - 140x #44304

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalMultifitConditionsHostESProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
auto const& timeCalibConstantsEB = timeCalibConstantsData.barrelItems();
auto const& timeCalibConstantsEE = timeCalibConstantsData.endcapItems();

for (unsigned int i = 0; i < barrelSize; i++) {
for (unsigned int i = 0; i < barrelSize; ++i) {
auto vi = view[i];

vi.pedestals_mean_x12() = pedestalsEB[i].mean_x12;
Expand All @@ -105,13 +105,13 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
vi.timeCalibConstants() = timeCalibConstantsEB[i];

std::memcpy(vi.pulseShapes().data(), pulseShapesEB[i].pdfval, sizeof(float) * EcalPulseShape::TEMPLATESAMPLES);
for (unsigned int j = 0; j < EcalPulseShape::TEMPLATESAMPLES; j++) {
for (unsigned int k = 0; k < EcalPulseShape::TEMPLATESAMPLES; k++) {
for (unsigned int j = 0; j < EcalPulseShape::TEMPLATESAMPLES; ++j) {
for (unsigned int k = 0; k < EcalPulseShape::TEMPLATESAMPLES; ++k) {
vi.pulseCovariance()(j, k) = pulseCovariancesEB[i].val(j, k);
}
}
} // end Barrel loop
for (unsigned int i = 0; i < endcapSize; i++) {
for (unsigned int i = 0; i < endcapSize; ++i) {
auto vi = view[barrelSize + i];

vi.pedestals_mean_x12() = pedestalsEE[i].mean_x12;
Expand All @@ -128,39 +128,41 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {

std::memcpy(vi.pulseShapes().data(), pulseShapesEE[i].pdfval, sizeof(float) * EcalPulseShape::TEMPLATESAMPLES);

for (unsigned int j = 0; j < EcalPulseShape::TEMPLATESAMPLES; j++) {
for (unsigned int k = 0; k < EcalPulseShape::TEMPLATESAMPLES; k++) {
for (unsigned int j = 0; j < EcalPulseShape::TEMPLATESAMPLES; ++j) {
for (unsigned int k = 0; k < EcalPulseShape::TEMPLATESAMPLES; ++k) {
vi.pulseCovariance()(j, k) = pulseCovariancesEE[i].val(j, k);
}
}
} // end Endcap loop

// === Scalar data (not by xtal)
//TimeBiasCorrection
// TimeBiasCorrection
auto const timeCorrAmplBinsSizeEB = timeBiasCorrectionsData.EBTimeCorrAmplitudeBins.size();
auto const timeCorrShiftBinsSizeEB = timeBiasCorrectionsData.EBTimeCorrShiftBins.size();
// Assert that there are not more parameters than the EcalMultiFitConditionsSoA expects
assert(timeBiasCorrectionsData.EBTimeCorrAmplitudeBins.size() <= kMaxTimeBiasCorrectionBinsEB);
assert(timeBiasCorrectionsData.EBTimeCorrShiftBins.size() <= kMaxTimeBiasCorrectionBinsEB);
assert(timeCorrAmplBinsSizeEB <= kMaxTimeBiasCorrectionBinsEB);
assert(timeCorrShiftBinsSizeEB <= kMaxTimeBiasCorrectionBinsEB);
std::memcpy(view.timeBiasCorrections_amplitude_EB().data(),
timeBiasCorrectionsData.EBTimeCorrAmplitudeBins.data(),
sizeof(float) * kMaxTimeBiasCorrectionBinsEB);
sizeof(float) * timeCorrAmplBinsSizeEB);
std::memcpy(view.timeBiasCorrections_shift_EB().data(),
timeBiasCorrectionsData.EBTimeCorrShiftBins.data(),
sizeof(float) * kMaxTimeBiasCorrectionBinsEB);
sizeof(float) * timeCorrShiftBinsSizeEB);

auto const timeCorrAmplBinsSizeEE = timeBiasCorrectionsData.EETimeCorrAmplitudeBins.size();
auto const timeCorrShiftBinsSizeEE = timeBiasCorrectionsData.EETimeCorrShiftBins.size();
// Assert that there are not more parameters than the EcalMultiFitConditionsSoA expects
assert(timeBiasCorrectionsData.EETimeCorrAmplitudeBins.size() <= kMaxTimeBiasCorrectionBinsEE);
assert(timeBiasCorrectionsData.EETimeCorrShiftBins.size() <= kMaxTimeBiasCorrectionBinsEE);
assert(timeCorrAmplBinsSizeEE <= kMaxTimeBiasCorrectionBinsEE);
assert(timeCorrShiftBinsSizeEE <= kMaxTimeBiasCorrectionBinsEE);
std::memcpy(view.timeBiasCorrections_amplitude_EE().data(),
timeBiasCorrectionsData.EETimeCorrAmplitudeBins.data(),
sizeof(float) * kMaxTimeBiasCorrectionBinsEE);
sizeof(float) * timeCorrAmplBinsSizeEE);
std::memcpy(view.timeBiasCorrections_shift_EE().data(),
timeBiasCorrectionsData.EETimeCorrShiftBins.data(),
sizeof(float) * kMaxTimeBiasCorrectionBinsEE);
sizeof(float) * timeCorrShiftBinsSizeEE);

view.timeBiasCorrectionSizeEB() =
std::min(timeBiasCorrectionsData.EBTimeCorrAmplitudeBins.size(), kMaxTimeBiasCorrectionBinsEB);
view.timeBiasCorrectionSizeEE() =
std::min(timeBiasCorrectionsData.EETimeCorrAmplitudeBins.size(), kMaxTimeBiasCorrectionBinsEE);
view.timeBiasCorrectionSizeEB() = std::min(timeCorrAmplBinsSizeEB, kMaxTimeBiasCorrectionBinsEB);
view.timeBiasCorrectionSizeEE() = std::min(timeCorrAmplBinsSizeEE, kMaxTimeBiasCorrectionBinsEE);

// SampleCorrelation
std::memcpy(view.sampleCorrelation_EB_G12().data(),
Expand All @@ -177,7 +179,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
samplesCorrelationData.EEG12SamplesCorrelation.data(),
sizeof(double) * ecalPh1::sampleSize);
std::memcpy(view.sampleCorrelation_EE_G6().data(),
samplesCorrelationData.EBG6SamplesCorrelation.data(),
samplesCorrelationData.EEG6SamplesCorrelation.data(),
sizeof(double) * ecalPh1::sampleSize);
std::memcpy(view.sampleCorrelation_EE_G1().data(),
samplesCorrelationData.EEG1SamplesCorrelation.data(),
Expand Down