linuxmsm/pd-mapper
0
0
Fork 0
mirror of https://github.com/linux-msm/pd-mapper.git synced 2026-02-25 13:12:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from lumag/fix-sysfs-path

Browse Source 
Fix the code handling the firmware path set in sysfs
This commit is contained in:
Konrad Dybcio
2025-12-30 15:09:23 +01:00
committed by GitHub
parent 0a43c8be56 fbace0b23e
commit 756f98e15d
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pd-mapper.c
View File

@@ -193,24 +193,25 @@ static int pd_load_map(const char *file)
return 0;
}
static int concat_path(char *base_path, char *firmware_path, char *path)
static int concat_path(char *base_path, char *firmware_path, char *path, size_t path_len)
{
if ((strlen(base_path) > 0) && (strlen(base_path) + 1 + strlen(firmware_path) + 1 < PATH_MAX)) {
strcpy(path, base_path);
strcat(path, "/");
strcat(path, firmware_path);
return 0;
} else {
warn("Path length exceeded %lu\n", sizeof(path));
if (strlen(base_path) + 1 + strlen(firmware_path) + 1 >= path_len) {
warn("Path length exceeded %lu\n", path_len);
return -1;
}
return -1;
strcpy(path, base_path);
strcat(path, "/");
strcat(path, firmware_path);
return 0;
}
#ifndef ANDROID
#define FIRMWARE_BASE "/lib/firmware/"
#define FIRMWARE_PARAM_PATH "/sys/module/firmware_class/parameters/path"
static DIR *opendir_firmware(char *firmware_path, char *out_path_opened)
static DIR *opendir_firmware(char *firmware_path, char *out_path_opened, size_t out_path_size)
{
int ret = 0, n;
DIR *fw_dir = NULL;
@@ -230,9 +231,13 @@ static DIR *opendir_firmware(char *firmware_path, char *out_path_opened)
goto err;
}
/* path not set in sysfs */
if (n <= 1)
goto err;
fw_sysfs_path[n - 1] = '\0';
ret = concat_path(fw_sysfs_path, firmware_path, out_path_opened);
ret = concat_path(fw_sysfs_path, firmware_path, out_path_opened, out_path_size);
if (ret)
goto err;
@@ -242,7 +247,7 @@ static DIR *opendir_firmware(char *firmware_path, char *out_path_opened)
return fw_dir;
err:
ret = concat_path(fw_sysfs_path, FIRMWARE_BASE, out_path_opened);
ret = concat_path(FIRMWARE_BASE, firmware_path, out_path_opened, out_path_size);
if (ret)
return fw_dir;
@@ -321,7 +326,7 @@ static int pd_enumerate_jsons(struct assoc *json_set)
firmware_value_copy = strdup(firmware_value);
firmware_path = dirname(firmware_value_copy);
fw_dir = opendir_firmware(firmware_path, path);
fw_dir = opendir_firmware(firmware_path, path, sizeof(path));
if (!fw_dir)
continue;