2018-10-03 05:41:02

by Arun Kumar Neelakantam

Subject: [PATCH] soc: qcom: qmi_interface: Limit txn ids to U16_MAX

Txn IDs created up to INT_MAX cause overflow while storing
the IDs in u16 type supported by QMI header.

Limit the txn IDs max value to U16_MAX to avoid overflow.

Signed-off-by: Arun Kumar Neelakantam <[email protected]>
---
drivers/soc/qcom/qmi_interface.c | 2 +-
include/linux/soc/qcom/qmi.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/qcom/qmi_interface.c b/drivers/soc/qcom/qmi_interface.c
index 938ca41c..c239a28 100644
--- a/drivers/soc/qcom/qmi_interface.c
+++ b/drivers/soc/qcom/qmi_interface.c
@@ -318,7 +318,7 @@ int qmi_txn_init(struct qmi_handle *qmi, struct qmi_txn *txn,
txn->dest = c_struct;

mutex_lock(&qmi->txn_lock);
- ret = idr_alloc_cyclic(&qmi->txns, txn, 0, INT_MAX, GFP_KERNEL);
+ ret = idr_alloc_cyclic(&qmi->txns, txn, 0, U16_MAX, GFP_KERNEL);
if (ret < 0)
pr_err("failed to allocate transaction id\n");

diff --git a/include/linux/soc/qcom/qmi.h b/include/linux/soc/qcom/qmi.h
index f4de336..5efa2b6 100644
--- a/include/linux/soc/qcom/qmi.h
+++ b/include/linux/soc/qcom/qmi.h
@@ -166,7 +166,7 @@ struct qmi_ops {
struct qmi_txn {
struct qmi_handle *qmi;

- int id;
+ u16 id;

struct mutex lock;
struct completion completion;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

2018-10-04 04:38:36

by Bjorn Andersson

Subject: Re: [PATCH] soc: qcom: qmi_interface: Limit txn ids to U16_MAX

On Tue 02 Oct 22:40 PDT 2018, Arun Kumar Neelakantam wrote:

> Txn IDs created up to INT_MAX cause overflow while storing
> the IDs in u16 type supported by QMI header.
>
> Limit the txn IDs max value to U16_MAX to avoid overflow.
>
> Signed-off-by: Arun Kumar Neelakantam <[email protected]>

Reviewed-by: Bjorn Andersson <[email protected]>

Regards,
Bjorn

> ---
> drivers/soc/qcom/qmi_interface.c | 2 +-
> include/linux/soc/qcom/qmi.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soc/qcom/qmi_interface.c b/drivers/soc/qcom/qmi_interface.c
> index 938ca41c..c239a28 100644
> --- a/drivers/soc/qcom/qmi_interface.c
> +++ b/drivers/soc/qcom/qmi_interface.c
> @@ -318,7 +318,7 @@ int qmi_txn_init(struct qmi_handle *qmi, struct qmi_txn *txn,
> txn->dest = c_struct;
>
> mutex_lock(&qmi->txn_lock);
> - ret = idr_alloc_cyclic(&qmi->txns, txn, 0, INT_MAX, GFP_KERNEL);
> + ret = idr_alloc_cyclic(&qmi->txns, txn, 0, U16_MAX, GFP_KERNEL);
> if (ret < 0)
> pr_err("failed to allocate transaction id\n");
>
> diff --git a/include/linux/soc/qcom/qmi.h b/include/linux/soc/qcom/qmi.h
> index f4de336..5efa2b6 100644
> --- a/include/linux/soc/qcom/qmi.h
> +++ b/include/linux/soc/qcom/qmi.h
> @@ -166,7 +166,7 @@ struct qmi_ops {
> struct qmi_txn {
> struct qmi_handle *qmi;
>
> - int id;
> + u16 id;
>
> struct mutex lock;
> struct completion completion;
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>

2018-11-14 18:03:39

by Andy Gross

Subject: Re: [PATCH] soc: qcom: qmi_interface: Limit txn ids to U16_MAX

On Wed, Oct 03, 2018 at 11:10:02AM +0530, Arun Kumar Neelakantam wrote:
> Txn IDs created up to INT_MAX cause overflow while storing
> the IDs in u16 type supported by QMI header.
>
> Limit the txn IDs max value to U16_MAX to avoid overflow.
>
> Signed-off-by: Arun Kumar Neelakantam <[email protected]>
> ---

Thanks for sending this in. I'll queue it up.


Andy