TPC dEdx: Fix memory cooruption from owning pointer leaked into subobject

davidrohr · davidrohr · commit 7cbbc7cdeb63 · 2022-04-01T21:14:02.000+02:00
diff --git a/GPU/GPUTracking/DataTypes/CalibdEdxContainer.cxx b/GPU/GPUTracking/DataTypes/CalibdEdxContainer.cxx
@@ -36,18 +36,19 @@ void CalibdEdxContainer::cloneFromObject(const CalibdEdxContainer& obj, char* ne
   mApplyFullGainMap = obj.mApplyFullGainMap;
   mCalibsLoad = obj.mCalibsLoad;
   if (obj.mCalibTrackTopologyPol) {
-    cloneFromObject(mCalibTrackTopologyPol, obj.mCalibTrackTopologyPol, newFlatBufferPtr, oldFlatBufferPtr);
+    subobjectCloneFromObject(mCalibTrackTopologyPol, obj.mCalibTrackTopologyPol);
   }
   if (obj.mCalibTrackTopologySpline) {
-    cloneFromObject(mCalibTrackTopologySpline, obj.mCalibTrackTopologySpline, newFlatBufferPtr, oldFlatBufferPtr);
+    subobjectCloneFromObject(mCalibTrackTopologySpline, obj.mCalibTrackTopologySpline);
   }
 }
 
 template <class Type>
-void CalibdEdxContainer::cloneFromObject(Type*& obj, const Type* objOld, char* newFlatBufferPtr, const char* oldFlatBufferPtr)
+void CalibdEdxContainer::subobjectCloneFromObject(Type*& obj, const Type* objOld)
 {
-  obj = FlatObject::relocatePointer(oldFlatBufferPtr, mFlatBufferPtr, objOld);
-  obj->cloneFromObject(*objOld, newFlatBufferPtr);
+  obj = reinterpret_cast<Type*>(mFlatBufferPtr);
+  memset((void*)obj, 0, sizeof(*obj));
+  obj->cloneFromObject(*objOld, mFlatBufferPtr + sizeOfCalibdEdxTrackTopologyObj<Type>());
 }
 #endif
 
@@ -157,18 +158,21 @@ void CalibdEdxContainer::loadSplineTopologyCorrectionFromFile(std::string_view f
 void CalibdEdxContainer::setPolTopologyCorrection(const CalibdEdxTrackTopologyPol& calibTrackTopology)
 {
   setTopologyCorrection(calibTrackTopology, mCalibTrackTopologyPol);
+  mCalibTrackTopologySpline = nullptr;
 }
 
 void CalibdEdxContainer::setDefaultPolTopologyCorrection()
 {
   CalibdEdxTrackTopologyPol calibTrackTopology;
   calibTrackTopology.setDefaultPolynomials();
   setTopologyCorrection(calibTrackTopology, mCalibTrackTopologyPol);
+  mCalibTrackTopologySpline = nullptr;
 }
 
 void CalibdEdxContainer::setSplineTopologyCorrection(const CalibdEdxTrackTopologySpline& calibTrackTopology)
 {
   setTopologyCorrection(calibTrackTopology, mCalibTrackTopologySpline);
+  mCalibTrackTopologyPol = nullptr;
 }
 
 void CalibdEdxContainer::loadZeroSupresssionThresholdFromFile(std::string_view fileName, std::string_view objName, const float minCorrectionFactor, const float maxCorrectionFactor)
diff --git a/GPU/GPUTracking/DataTypes/CalibdEdxContainer.h b/GPU/GPUTracking/DataTypes/CalibdEdxContainer.h
@@ -267,7 +267,7 @@ class CalibdEdxContainer : public o2::gpu::FlatObject
 
 #if !defined(GPUCA_GPUCODE)
   template <class Type>
-  void cloneFromObject(Type*& obj, const Type* objOld, char* newFlatBufferPtr, const char* oldFlatBufferPtr);
+  void subobjectCloneFromObject(Type*& obj, const Type* objOld);
 
   /// this functions 'smoothes' a CalDet by calculating for each value in a pad the average value using the neighbouring pads, but do not take into account the current pad
   /// \return returns 'smoothed' CalDet object

Original file line number	Diff line number	Diff line change
`@@ -36,18 +36,19 @@ void CalibdEdxContainer::cloneFromObject(const CalibdEdxContainer& obj, char* ne`
`36`	`36`	`mApplyFullGainMap = obj.mApplyFullGainMap;`
`37`	`37`	`mCalibsLoad = obj.mCalibsLoad;`
`38`	`38`	`if (obj.mCalibTrackTopologyPol) {`
`39`		`- cloneFromObject(mCalibTrackTopologyPol, obj.mCalibTrackTopologyPol, newFlatBufferPtr, oldFlatBufferPtr);`
	`39`	`+ subobjectCloneFromObject(mCalibTrackTopologyPol, obj.mCalibTrackTopologyPol);`
`40`	`40`	`}`
`41`	`41`	`if (obj.mCalibTrackTopologySpline) {`
`42`		`- cloneFromObject(mCalibTrackTopologySpline, obj.mCalibTrackTopologySpline, newFlatBufferPtr, oldFlatBufferPtr);`
	`42`	`+ subobjectCloneFromObject(mCalibTrackTopologySpline, obj.mCalibTrackTopologySpline);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`template <class Type>`
`47`		`-void CalibdEdxContainer::cloneFromObject(Type& obj, const Type objOld, char* newFlatBufferPtr, const char* oldFlatBufferPtr)`
	`47`	`+void CalibdEdxContainer::subobjectCloneFromObject(Type& obj, const Type objOld)`
`48`	`48`	`{`
`49`		`- obj = FlatObject::relocatePointer(oldFlatBufferPtr, mFlatBufferPtr, objOld);`
`50`		`- obj->cloneFromObject(*objOld, newFlatBufferPtr);`
	`49`	`+ obj = reinterpret_cast<Type*>(mFlatBufferPtr);`
	`50`	`+ memset((void)obj, 0, sizeof(obj));`
	`51`	`+ obj->cloneFromObject(*objOld, mFlatBufferPtr + sizeOfCalibdEdxTrackTopologyObj<Type>());`
`51`	`52`	`}`
`52`	`53`	`#endif`
`53`	`54`
`@@ -157,18 +158,21 @@ void CalibdEdxContainer::loadSplineTopologyCorrectionFromFile(std::string_view f`
`157`	`158`	`void CalibdEdxContainer::setPolTopologyCorrection(const CalibdEdxTrackTopologyPol& calibTrackTopology)`
`158`	`159`	`{`
`159`	`160`	`setTopologyCorrection(calibTrackTopology, mCalibTrackTopologyPol);`
	`161`	`+ mCalibTrackTopologySpline = nullptr;`
`160`	`162`	`}`
`161`	`163`
`162`	`164`	`void CalibdEdxContainer::setDefaultPolTopologyCorrection()`
`163`	`165`	`{`
`164`	`166`	`CalibdEdxTrackTopologyPol calibTrackTopology;`
`165`	`167`	`calibTrackTopology.setDefaultPolynomials();`
`166`	`168`	`setTopologyCorrection(calibTrackTopology, mCalibTrackTopologyPol);`
	`169`	`+ mCalibTrackTopologySpline = nullptr;`
`167`	`170`	`}`
`168`	`171`
`169`	`172`	`void CalibdEdxContainer::setSplineTopologyCorrection(const CalibdEdxTrackTopologySpline& calibTrackTopology)`
`170`	`173`	`{`
`171`	`174`	`setTopologyCorrection(calibTrackTopology, mCalibTrackTopologySpline);`
	`175`	`+ mCalibTrackTopologyPol = nullptr;`
`172`	`176`	`}`
`173`	`177`
`174`	`178`	`void CalibdEdxContainer::loadZeroSupresssionThresholdFromFile(std::string_view fileName, std::string_view objName, const float minCorrectionFactor, const float maxCorrectionFactor)`