From 9cc183a531e1e309a99784f65b15c0fb1a18ddef Mon Sep 17 00:00:00 2001 From: P Dheeraj Srujan Kumar Date: Fri, 6 May 2022 06:11:20 +0530 Subject: Update to internal 1-0.91-67 Signed-off-by: P Dheeraj Srujan Kumar --- .../files/0001-Add-vector-size-check.patch | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 meta-openbmc-mods/meta-common/recipes-intel/psu-manager/files/0001-Add-vector-size-check.patch (limited to 'meta-openbmc-mods/meta-common/recipes-intel/psu-manager/files') diff --git a/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/files/0001-Add-vector-size-check.patch b/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/files/0001-Add-vector-size-check.patch new file mode 100644 index 000000000..0df27f048 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/files/0001-Add-vector-size-check.patch @@ -0,0 +1,49 @@ +From 556d1fe01fa1624b7ee967efbd2f55ed80375356 Mon Sep 17 00:00:00 2001 +From: "Arun P. Mohanan" +Date: Tue, 15 Feb 2022 16:56:37 +0530 +Subject: [PATCH] Add vector size check + +When PowerSupplyRedundancyEnabled is set to true and RotationRankOrder +is 0, xyz.openbmc_project.coldredundancy.service core-dump issue +is observed. + +Add a check to address above corner case and avoid core-dump. + +Tested: +Verified core-dump is not observed with above settings + +Feb 15 11:39:25 intel-obmc psuredundancy[18502]: RotationRankOrder less than number of PSUs + +Signed-off-by: Arun P. Mohanan +--- + src/cold_redundancy.cpp | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/src/cold_redundancy.cpp b/src/cold_redundancy.cpp +index 9cee6ec..9dc5907 100644 +--- a/src/cold_redundancy.cpp ++++ b/src/cold_redundancy.cpp +@@ -615,7 +615,19 @@ void ColdRedundancy::reRanking(void) + { + psu->order = 0; + } +- orders[psuNumber++] = psu->order; ++ if (psuNumber < orders.size()) ++ { ++ orders[psuNumber++] = psu->order; ++ } ++ else ++ { ++ static bool logOnlyOnce = false; ++ if (!logOnlyOnce) ++ { ++ std::cerr << "RotationRankOrder less than number of PSUs\n"; ++ logOnlyOnce = true; ++ } ++ } + } + rotationRankOrder(orders); + } +-- +2.17.1 + -- cgit v1.2.3