Added Support for Ubuntu 24.04/Fix for UUID/Github File descriptors l…

…eak #5
ADLINK · Aug 20, 2024 · 95c3b35 · 95c3b35
1 parent e277835
commit 95c3b35
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/app/main.c b/app/main.c
@@ -26,7 +26,7 @@
 #include <eapi.h>
 #include <uuid/uuid.h>
 
-#define Version	"ADLINK-SEMA-EC-LINUX-V4_R3_1_24_08_01"
+#define Version	"ADLINK-SEMA-EC-LINUX-V4_R3_3_24_08_20"
 
 char*			ExeName;
 uint8_t	SetWatchdog, TriggerWatchdog, StopWatchdog, WatchDogCap,IsPwrUpWDogStart, IsPwrUpWDogStop;
@@ -535,7 +535,7 @@ int DispatchCMDToSEMA(int argc,char *argv[])
 			printf("Get EApi information failed\n");
 			errno_exit("EApiPwrUpWDogStop");
 		}
-		printf("Watchdog is disabled  successfully\n");
+		printf("Watchdog is disabled successfully\n");
 	}
 
 

diff --git a/driver/adl-ec-i2c.c b/driver/adl-ec-i2c.c
@@ -1186,10 +1186,10 @@ static int adl_bmc_i2c_probe(struct platform_device *pdev)
     adap4->owner = THIS_MODULE;
     adap4->class = I2C_CLASS_DEPRECATED;
 
-    strlcpy(adap1->name, "ADLINK BMC I2C adapter bus 1", sizeof(adap1->name));
-    strlcpy(adap2->name, "ADLINK BMC I2C adapter bus 2", sizeof(adap2->name));
-    strlcpy(adap3->name, "ADLINK BMC I2C adapter bus 3", sizeof(adap3->name));
-    strlcpy(adap4->name, "ADLINK BMC I2C adapter bus 4", sizeof(adap4->name));
+    strscpy(adap1->name, "ADLINK BMC I2C adapter bus 1", sizeof(adap1->name));
+    strscpy(adap2->name, "ADLINK BMC I2C adapter bus 2", sizeof(adap2->name));
+    strscpy(adap3->name, "ADLINK BMC I2C adapter bus 3", sizeof(adap3->name));
+    strscpy(adap4->name, "ADLINK BMC I2C adapter bus 4", sizeof(adap4->name));
 
      adap1->algo = &adlink_i2c_algo1;
      adap2->algo = &adlink_i2c_algo2;

diff --git a/lib/boardinfo.c b/lib/boardinfo.c
@@ -48,9 +48,9 @@ uint32_t IsFileExist(char *sysf)
 {
 	int fd;
 	fd = open(sysf, O_RDONLY);
-	if (fd < 1)
+	if (fd < 0)
 		return EAPI_STATUS_READ_ERROR;
-
+	close(fd);
 	return EAPI_STATUS_SUCCESS;
 
 }
@@ -327,6 +327,7 @@ static int get_regulator_voltage(int id, uint32_t *mVolts, char *buf, uint32_t s
 
 	if(ret)
 	{
+		close(dev_handle);
 		return EAPI_STATUS_ERROR;
 	}
 	*mVolts = vm.volt;
@@ -370,6 +371,7 @@ uint32_t EApiBoardGetVoltageCap(uint32_t *value)
 	ret=ioctl(dev_handle , GET_VOLT_MONITOR_CAP, &vm_cap);
 	if(ret)
 	{
+		close(dev_handle);
 		return EAPI_STATUS_ERROR;
 	}
 	*value=vm_cap;

diff --git a/lib/storage.c b/lib/storage.c
@@ -35,7 +35,7 @@
 struct secure {
         uint8_t Region;
         uint8_t permission;
-        char passcode[4];
+        char passcode[8];
 };
 static char NVMEM_DEVICE[285];
 //static char NVMEM_SEC_DEVICE[285];
@@ -485,9 +485,11 @@ uint32_t EApiStorageLock(uint32_t Id,uint32_t Region)
 	}
 	if(ioctl(fd, EAPI_STOR_LOCK, &data ) < 0)
         {
+		close(fd);
 		return EAPI_STATUS_UNSUPPORTED;
 	}
 
+	close(fd);
 	return status;
 }
 
@@ -503,6 +505,7 @@ uint32_t EApiStorageUnLock(uint32_t Id,uint32_t Region,uint32_t Permission, char
 	data.Region=Region;
 	data.permission=Permission;
 
+	memset(data.passcode,0,sizeof(data.passcode));
 	memcpy(data.passcode,passcode,strlen(passcode));
 
         if((fd = open("/dev/ec-nvmem-eapi", O_RDWR)) < 0)
@@ -512,8 +515,10 @@ uint32_t EApiStorageUnLock(uint32_t Id,uint32_t Region,uint32_t Permission, char
 
         if(ioctl(fd, EAPI_STOR_UNLOCK,&data ) < 0)
         {
+				close(fd);
                 return EAPI_STATUS_UNSUPPORTED;
         }
 
+		close(fd);
         return status;
 }