[PATCH 3/3] soc: qcom: mdt_loader: Actually use the e_phoff

[Bjorn Andersson]

Rather than relying/assuming that the tools generating the firmware
places the program headers immediately following the ELF header, use
e_phoff as intended to find the program headers.

Signed-off-by: Bjorn Andersson <bjorn.anders...@oss.qualcomm.com>
---
 drivers/soc/qcom/mdt_loader.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index 
dd3875dd7ef68d1f135efd8efdf5634f27aadd5e..01fea4c510717197a67a529cfa467c6a9a3ab55d
 100644
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -111,7 +111,7 @@ ssize_t qcom_mdt_get_size(const struct firmware *fw)
                return -EINVAL;
 
        ehdr = (struct elf32_hdr *)fw->data;
-       phdrs = (struct elf32_phdr *)(ehdr + 1);
+       phdrs = (struct elf32_phdr *)(fw->data + ehdr->e_phoff);
 
        for (i = 0; i < ehdr->e_phnum; i++) {
                phdr = &phdrs[i];
@@ -166,7 +166,7 @@ void *qcom_mdt_read_metadata(const struct firmware *fw, 
size_t *data_len,
                return ERR_PTR(-EINVAL);
 
        ehdr = (struct elf32_hdr *)fw->data;
-       phdrs = (struct elf32_phdr *)(ehdr + 1);
+       phdrs = (struct elf32_phdr *)(fw->data + ehdr->e_phoff);
 
        if (ehdr->e_phnum < 2)
                return ERR_PTR(-EINVAL);
@@ -249,7 +249,7 @@ int qcom_mdt_pas_init(struct device *dev, const struct 
firmware *fw,
                return -EINVAL;
 
        ehdr = (struct elf32_hdr *)fw->data;
-       phdrs = (struct elf32_phdr *)(ehdr + 1);
+       phdrs = (struct elf32_phdr *)(fw->data + ehdr->e_phoff);
 
        for (i = 0; i < ehdr->e_phnum; i++) {
                phdr = &phdrs[i];
@@ -304,7 +304,7 @@ static bool qcom_mdt_bins_are_split(const struct firmware 
*fw, const char *fw_na
        int i;
 
        ehdr = (struct elf32_hdr *)fw->data;
-       phdrs = (struct elf32_phdr *)(ehdr + 1);
+       phdrs = (struct elf32_phdr *)(fw->data + ehdr->e_phoff);
 
        for (i = 0; i < ehdr->e_phnum; i++) {
                /*
@@ -349,7 +349,7 @@ static int __qcom_mdt_load(struct device *dev, const struct 
firmware *fw,
 
        is_split = qcom_mdt_bins_are_split(fw, fw_name);
        ehdr = (struct elf32_hdr *)fw->data;
-       phdrs = (struct elf32_phdr *)(ehdr + 1);
+       phdrs = (struct elf32_phdr *)(fw->data + ehdr->e_phoff);
 
        for (i = 0; i < ehdr->e_phnum; i++) {
                phdr = &phdrs[i];

-- 
2.49.0