diff options
| author | Arun Kumar Neelakantam <aneela@codeaurora.org> | 2018-10-03 08:40:02 +0300 |
|---|---|---|
| committer | Andy Gross <andy.gross@linaro.org> | 2018-11-14 21:02:07 +0300 |
| commit | c4fe17e0e3a346cc855b7b41c00ff7b04c56d32b (patch) | |
| tree | 0f0eea974b98395a412c3ab1a682e2127970e4c9 | |
| parent | e0f2cfeb59c81cbcfc7fbcb7ec0636020499813b (diff) | |
| download | linux-c4fe17e0e3a346cc855b7b41c00ff7b04c56d32b.tar.xz | |
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 <aneela@codeaurora.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
| -rw-r--r-- | drivers/soc/qcom/qmi_interface.c | 2 | ||||
| -rw-r--r-- | 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 938ca41c56cd..c239a28e503f 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 f4de33654a60..5efa2b67fa55 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; |