soc: qcom: socinfo: Fix off-by-one array index bounds check
Subsystems (3)
PATCH 1/1 soc: qcom: socinfo: Fix off-by-one array index bounds check
From: Colin Ian King <[email protected]>
There is an off-by-one array index bounds check on array pmic_models. Fix this by checking using < rather than <= on the array size.
Addresses-Coverity: ("Out-of-bounds read")
--- drivers/soc/qcom/socinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/socinfo.c +1 -1
@@ -332,7 +332,7 @@ static int qcom_show_pmic_model_array(struct seq_file *seq, void *p)unsigned int model =SOCINFO_MINOR (get_unaligned_le32 (ptr +2 * i *sizeof (u32)));unsigned int die_rev =get_unaligned_le32 (ptr + (2 * i +1 ) *sizeof (u32)); -if (model <=ARRAY_SIZE (pmic_models) && pmic_models[model]) +if (model <ARRAY_SIZE (pmic_models) && pmic_models[model])seq_printf (seq,"%s %u.%u\n" , pmic_models[model],SOCINFO_MAJOR (le32_to_cpu (die_rev)),SOCINFO_MINOR (le32_to_cpu (die_rev)));
Signature · 1 line
2.29.2
PATCH 1/1 soc: qcom: socinfo: Fix an off by one in qcom_show_pmic_model()
These need to be < ARRAY_SIZE() instead of <= ARRAY_SIZE() to prevent accessing one element beyond the end of the array.
--- drivers/soc/qcom/socinfo.c | 2 +- 1 file changed, 1 insertions(+), 1 deletions(-)
drivers/soc/qcom/socinfo.c +1 -1
@@ -309,7 +309,7 @@ static int qcom_show_pmic_model(struct seq_file *seq, void *p)if (model <0 )return -EINVAL ; -if (model <=ARRAY_SIZE (pmic_models) && pmic_models[model]) +if (model <ARRAY_SIZE (pmic_models) && pmic_models[model])seq_printf (seq,"%s\n" , pmic_models[model]);else seq_printf (seq,"unknown (%d)\n" , model);
Signature · 1 line
2.29.2
Re: [PATCH] soc: qcom: socinfo: Fix an off by one in qcom_show_pmic_model()
Hi,
Quoted 9 lines · Dan Carpenter
These need to be <
ARRAY_SIZE()instead of <=ARRAY_SIZE()to prevent accessing one element beyond the end of the array.Fixes e9247e2ce577 ("soc: qcom: socinfo: fix printing of pmic_model")Signed-off-by Dan Carpenter <[email protected]>--- drivers/soc/qcom/socinfo.c | 2 +- 1 file changed, 1 insertions(+), 1 deletions(-)
Re: [PATCH] soc: qcom: socinfo: Fix an off by one in qcom_show_pmic_model()
In reply to Dan CarpenterQuoted 6 lines · Dan Carpenter
These need to be <
ARRAY_SIZE()instead of <=ARRAY_SIZE()to prevent accessing one element beyond the end of the array.Fixes e9247e2ce577 ("soc: qcom: socinfo: fix printing of pmic_model")Signed-off-by Dan Carpenter <[email protected]>
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH] soc: qcom: socinfo: Fix an off by one in qcom_show_pmic_model()
In reply to Dan CarpenterQuoting Dan Carpenter (2021-01-20 01:57:55)
Quoted 6 lines
These need to be <
ARRAY_SIZE()instead of <=ARRAY_SIZE()to prevent accessing one element beyond the end of the array.Fixes e9247e2ce577 ("soc: qcom: socinfo: fix printing of pmic_model")Signed-off-by Dan Carpenter <[email protected]>---
Re: [PATCH] soc: qcom: socinfo: Fix an off by one in qcom_show_pmic_model()
In reply to Dan CarpenterThis patch was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This patch was applied to qcom/linux.git (refs/heads/for-next):
Quoted 8 lines · On Wed, 20 Jan 2021 12:57:55 +0300 you wrote:
These need to be <
ARRAY_SIZE()instead of <=ARRAY_SIZE()to prevent accessing one element beyond the end of the array.Fixes e9247e2ce577 ("soc: qcom: socinfo: fix printing of pmic_model")Signed-off-by Dan Carpenter <[email protected]>--- drivers/soc/qcom/socinfo.c | 2 +- 1 file changed, 1 insertions(+), 1 deletions(-)
Here is the summary with links:
- soc: qcom: socinfo: Fix an off by one in qcom_show_pmic_model()
https://git.kernel.org/qcom/c/5fb33d8960dc
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
There was a second one introduced recently as well. I've sent a patch for it.
regards,
dan carpenter
This patch was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This patch was applied to qcom/linux.git (refs/heads/for-next):
Quoted 11 lines · On Mon, 18 Jan 2021 11:36:51 +0000 you wrote:
From: Colin Ian King <[email protected]>
There is an off-by-one array index bounds check on array
pmic_models. Fix this by checking using < rather than <= on the array size.Addresses-Coverity: ("Out-of-bounds read")
Fixes 734c78e7febf ("soc: qcom: socinfo: add info from PMIC models array")Signed-off-by Colin Ian King <[email protected]>[...]
Here is the summary with links:
- soc: qcom: socinfo: Fix off-by-one array index bounds check
https://git.kernel.org/qcom/c/e6393818c8d1
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html