From 2b2afbb29cc71bc2585638757e990e962558e4bd Mon Sep 17 00:00:00 2001
From: Jayashankar Padath <jayashankar.padath@in.ibm.com>
Date: Sun, 6 Apr 2025 12:24:52 -0500
Subject: [PATCH] oem-ibm: Fix for the PEL parsing issue

This commit contains the fix for the invalid PEL issue where the
PEL send by the remote end point could not get parsed properly.
Fix is to explicitly execute the unix FD sync and close after the
write FD operation.

Fixes : STG Defect 678010

Change-Id: Ib81fd21e160423f103218e8839133119a5a89cc1
Signed-off-by: Jayashankar Padath <jayashankar.padath@in.ibm.com>
---
 oem/ibm/libpldmresponder/file_io.cpp         | 11 +++++++++++
 oem/ibm/libpldmresponder/file_io_by_type.cpp |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/oem/ibm/libpldmresponder/file_io.cpp b/oem/ibm/libpldmresponder/file_io.cpp
index 86138508..50d81037 100644
--- a/oem/ibm/libpldmresponder/file_io.cpp
+++ b/oem/ibm/libpldmresponder/file_io.cpp
@@ -245,6 +245,17 @@ int DMA::transferDataHost(int fd, uint32_t offset, uint32_t length,
                 "OFFSET", offset);
             return rc;
         }
+        
+        int retCode = fsync(fd);
+        if (retCode == -1)
+        {
+            retCode = -errno;
+            error("Failed to perform unix FD fsync of '{UPSTREAM}' data transfer between BMC and remote terminus with errno as '{RC}', length as '{LEN}' at offset '{OFFSET}'",
+                  "UPSTREAM",upstream, "RC", retCode, "LEN", length,
+                  "OFFSET", offset);
+            return retCode;
+        }
+
         responseByte = rc;
     }
 
diff --git a/oem/ibm/libpldmresponder/file_io_by_type.cpp b/oem/ibm/libpldmresponder/file_io_by_type.cpp
index 1afbabf5..b5a5204b 100644
--- a/oem/ibm/libpldmresponder/file_io_by_type.cpp
+++ b/oem/ibm/libpldmresponder/file_io_by_type.cpp
@@ -162,6 +162,14 @@ void FileHandler::transferFileData(
         {
             if (sharedAIORespDataobj.functionPtr != nullptr)
             {
+                rc = close(fd);
+                if (rc == -1)
+                {
+                    rc = -errno;
+                    error("Failed to close the unix FD with errno as '{ERROR_NUM}', length as '{LENGTH}', offset at '{OFFSET}' and upstream flag as '{UPSTREAM}'",
+                          "ERROR_NUM", rc, "LENGTH", length, "OFFSET", offset,
+                          "UPSTREAM", upstream);
+                }
                 rc = sharedAIORespDataobj.functionPtr->postDataTransferCallBack(
                     command == PLDM_WRITE_FILE_BY_TYPE_FROM_MEMORY,
                     data.length);