4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Elder elder@linaro.org
[ Upstream commit 8fa1a21409da6abfe890f66532f9fcd8d2c25a3d ]
If there is at least one entry in the partition table, but no global entry, the qcom_smem_set_global_partition() should return an error just like it does if there are no partition table entries.
It turns out the function still returns an error in this case, but it waits to do so until it has mistakenly treated the last entry in the table as if it were the global entry found.
Fix the function to return immediately if no global entry is found in the table.
Signed-off-by: Alex Elder elder@linaro.org Reviewed-by: Bjorn Andersson bjorn.andersson@linaro.org Signed-off-by: Andy Gross andy.gross@linaro.org Signed-off-by: Sasha Levin alexander.levin@microsoft.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/soc/qcom/smem.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
--- a/drivers/soc/qcom/smem.c +++ b/drivers/soc/qcom/smem.c @@ -695,9 +695,10 @@ static u32 qcom_smem_get_item_count(stru static int qcom_smem_set_global_partition(struct qcom_smem *smem) { struct smem_partition_header *header; - struct smem_ptable_entry *entry = NULL; + struct smem_ptable_entry *entry; struct smem_ptable *ptable; u32 host0, host1, size; + bool found = false; int i;
ptable = qcom_smem_get_ptable(smem); @@ -709,11 +710,13 @@ static int qcom_smem_set_global_partitio host0 = le16_to_cpu(entry->host0); host1 = le16_to_cpu(entry->host1);
- if (host0 == SMEM_GLOBAL_HOST && host0 == host1) + if (host0 == SMEM_GLOBAL_HOST && host0 == host1) { + found = true; break; + } }
- if (!entry) { + if (!found) { dev_err(smem->dev, "Missing entry for global partition\n"); return -EINVAL; }