| From 59d38f0983a46433b094c06c74e748e7ea54b448 Mon Sep 17 00:00:00 2001 |
| From: Will Deacon <will@kernel.org> |
| Date: Mon, 4 Nov 2019 15:58:15 +0000 |
| Subject: [PATCH] firmware: qcom: scm: Ensure 'a0' status code is treated as |
| signed |
| |
| commit ff34f3cce278a0982a7b66b1afaed6295141b1fc upstream. |
| |
| The 'a0' member of 'struct arm_smccc_res' is declared as 'unsigned long', |
| however the Qualcomm SCM firmware interface driver expects to receive |
| negative error codes via this field, so ensure that it's cast to 'long' |
| before comparing to see if it is less than 0. |
| |
| Cc: <stable@vger.kernel.org> |
| Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> |
| Signed-off-by: Will Deacon <will@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/firmware/qcom_scm-64.c b/drivers/firmware/qcom_scm-64.c |
| index 91d5ad7cf58b..25e0f60c759a 100644 |
| --- a/drivers/firmware/qcom_scm-64.c |
| +++ b/drivers/firmware/qcom_scm-64.c |
| @@ -150,7 +150,7 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id, |
| kfree(args_virt); |
| } |
| |
| - if (res->a0 < 0) |
| + if ((long)res->a0 < 0) |
| return qcom_scm_remap_error(res->a0); |
| |
| return 0; |
| -- |
| 2.7.4 |
| |
