diff options
| author | Raghuram Subramani <raghus2247@gmail.com> | 2024-12-10 19:24:06 +0530 |
|---|---|---|
| committer | Raghuram Subramani <raghus2247@gmail.com> | 2024-12-10 19:24:06 +0530 |
| commit | 6fcfee9ad063deee7ebf0cfe679a26a7d3bb0018 (patch) | |
| tree | d64b0946ed627a54bac6a1ee0c7e6e2615bb334b /sound/soc/msm/qdsp6v2/q6voice.c | |
| parent | 75aa08b2b132058296cf4d7ceb5fde8fa08d9585 (diff) | |
| parent | cab36b84b72b7eabba1639dc7520161d7de8567b (diff) | |
Merge remote-tracking branch 'los/lineage-20' into lineage-21HEADlineage-21
Diffstat (limited to 'sound/soc/msm/qdsp6v2/q6voice.c')
| -rw-r--r-- | sound/soc/msm/qdsp6v2/q6voice.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sound/soc/msm/qdsp6v2/q6voice.c b/sound/soc/msm/qdsp6v2/q6voice.c index 996567ff3a0e..a2d7c334ee7b 100644 --- a/sound/soc/msm/qdsp6v2/q6voice.c +++ b/sound/soc/msm/qdsp6v2/q6voice.c @@ -1,5 +1,5 @@ /* Copyright (c) 2012-2018, 2020, The Linux Foundation. All rights reserved. - * + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and * only version 2 as published by the Free Software Foundation. @@ -6771,7 +6771,7 @@ static int32_t qdsp_cvs_callback(struct apr_client_data *data, void *priv) VSS_ISTREAM_EVT_OOB_NOTIFY_ENC_BUFFER_READY) { int ret = 0; u16 cvs_handle; - uint32_t *cvs_voc_pkt; + uint32_t *cvs_voc_pkt, tot_buf_sz; struct cvs_enc_buffer_consumed_cmd send_enc_buf_consumed_cmd; void *apr_cvs; @@ -6800,9 +6800,15 @@ static int32_t qdsp_cvs_callback(struct apr_client_data *data, void *priv) VSS_ISTREAM_EVT_OOB_NOTIFY_ENC_BUFFER_CONSUMED; cvs_voc_pkt = v->shmem_info.sh_buf.buf[1].data; + + if (__builtin_add_overflow(cvs_voc_pkt[2], + 3 * sizeof(uint32_t), &tot_buf_sz)) { + pr_err("%s: integer overflow detected\n", __func__); + return -EINVAL; + } + if (cvs_voc_pkt != NULL && common.mvs_info.ul_cb != NULL) { - if (v->shmem_info.sh_buf.buf[1].size < - ((3 * sizeof(uint32_t)) + cvs_voc_pkt[2])) { + if (v->shmem_info.sh_buf.buf[1].size < tot_buf_sz) { pr_err("%s: invalid voc pkt size\n", __func__); return -EINVAL; } |