Bug fixes and improved logging in MHI
Subsystems (2)
cover Bug fixes and improved logging in MHI
A set of patches for bug fixes and improved logging in mhi/core/boot.c. Verified on x86 and arm64 platforms.
Bhaumik Bhatt (5):
bus: mhi: core: Handle firmware load using state worker
bus: mhi: core: WARN_ON for malformed vector table
bus: mhi: core: Return appropriate error codes for AMSS load failure
bus: mhi: core: Improve debug logs for loading firmware
bus: mhi: core: Ensure non-zero session or sequence ID values
Hemant Kumar (3):
bus: mhi: core: Cache intmod from mhi event to mhi channel
bus: mhi: core: Add range check for channel id received in event ring
bus: mhi: core: Read transfer length from an event properly
drivers/bus/mhi/core/boot.c | 74 +++++++++++++++++++++++++---------------- drivers/bus/mhi/core/init.c | 5 ++- drivers/bus/mhi/core/internal.h | 1 + drivers/bus/mhi/core/main.c | 17 +++++++--- drivers/bus/mhi/core/pm.c | 6 +--- include/linux/mhi.h | 2 -- 6 files changed, 64 insertions(+), 41 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 2/8 bus: mhi: core: Add range check for channel id received in event ring
From: Hemant Kumar <[email protected]>
MHI data completion handler function reads channel id from event ring element. Value is under the control of MHI devices and can be any value between 0 and 255. In order to prevent out of bound access add a bound check against the max channel supported by controller and skip processing of that event ring element.
--- drivers/bus/mhi/core/main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bus/mhi/core/main.c +3 -0
@@ -827,6 +827,9 @@ int mhi_process_data_event_ring(struct mhi_controller *mhi_cntrl,enum mhi_pkt_type type =MHI_TRE_GET_EV_TYPE (local_rp); chan =MHI_TRE_GET_EV_CHID (local_rp); +if (WARN_ON (chan >= mhi_cntrl->max_chan)) +continue ; + mhi_chan = &mhi_cntrl->mhi_chan[chan];if (likely (type ==MHI_PKT_TYPE_TX_EVENT )) {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 8/8 bus: mhi: core: Ensure non-zero session or sequence ID values
In reply to Bhaumik BhattWhile writing any sequence or session identifiers, it is possible that the host could write a zero value, whereas only non-zero values are supported writes to those registers. Ensure that host does not write a non-zero value for those cases.
--- drivers/bus/mhi/core/boot.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/bus/mhi/core/boot.c +6 -0
@@ -199,6 +199,9 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl,mhi_write_reg (mhi_cntrl, base,BHIE_TXVECSIZE_OFFS , mhi_buf->len); sequence_id =prandom_u32 () &BHIE_TXVECSTATUS_SEQNUM_BMSK ; +if (unlikely (!sequence_id)) + sequence_id =1 ; +mhi_write_reg_field (mhi_cntrl, base,BHIE_TXVECDB_OFFS ,BHIE_TXVECDB_SEQNUM_BMSK ,BHIE_TXVECDB_SEQNUM_SHFT , sequence_id);
@@ -254,6 +257,9 @@ static int mhi_fw_load_sbl(struct mhi_controller *mhi_cntrl, lower_32_bits(dma_addr));mhi_write_reg (mhi_cntrl, base,BHI_IMGSIZE , size); session_id =prandom_u32 () &BHI_TXDB_SEQNUM_BMSK ; +if (unlikely (!session_id)) + session_id =1 ; +mhi_write_reg (mhi_cntrl, base,BHI_IMGTXDB , session_id);read_unlock_bh (pm_lock);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 1/8 bus: mhi: core: Cache intmod from mhi event to mhi channel
In reply to Bhaumik BhattFrom: Hemant Kumar <[email protected]>
Driver is using zero initialized intmod value from mhi channel when configuring TRE for bei field. This prevents interrupt moderation to take effect in case it is supported by an event ring. Fix this by copying intmod value from associated event ring to mhi channel upon registering mhi controller.
--- drivers/bus/mhi/core/init.c | 4 ++++ drivers/bus/mhi/core/main.c | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-)
drivers/bus/mhi/core/init.c +4 -0
@@ -864,6 +864,10 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,mutex_init (&mhi_chan->mutex);init_completion (&mhi_chan->completion);rwlock_init (&mhi_chan->lock); + +/* used in setting bei field of TRE */ + mhi_event = &mhi_cntrl->mhi_event[mhi_chan->er_index]; + mhi_chan->intmod = mhi_event->intmod; }if (mhi_cntrl->bounce_buf) {
drivers/bus/mhi/core/main.c +6 -3
@@ -929,7 +929,7 @@ int mhi_queue_skb(struct mhi_device *mhi_dev, enum dma_data_direction dir,struct mhi_ring *buf_ring = &mhi_chan->buf_ring;struct mhi_buf_info *buf_info;struct mhi_tre *mhi_tre; -int ret; +int ret, bei;/* If MHI host pre-allocates buffers then client drivers cannot queue */ if (mhi_chan->pre_alloc)
@@ -966,10 +966,11 @@ int mhi_queue_skb(struct mhi_device *mhi_dev, enum dma_data_direction dir, goto map_error; mhi_tre = tre_ring->wp; + bei = !!(mhi_chan->intmod); mhi_tre->ptr =MHI_TRE_DATA_PTR (buf_info->p_addr); mhi_tre->dword[0 ] =MHI_TRE_DATA_DWORD0 (buf_info->len); - mhi_tre->dword[1 ] =MHI_TRE_DATA_DWORD1 (1 ,1 ,0 ,0 ); + mhi_tre->dword[1 ] =MHI_TRE_DATA_DWORD1 (bei,1 ,0 ,0 );/* increment WP */ mhi_add_ring_element (mhi_cntrl, tre_ring);
@@ -1006,6 +1007,7 @@ int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,struct mhi_ring *buf_ring = &mhi_chan->buf_ring;struct mhi_buf_info *buf_info;struct mhi_tre *mhi_tre; +int bei;/* If MHI host pre-allocates buffers then client drivers cannot queue */ if (mhi_chan->pre_alloc)
@@ -1043,10 +1045,11 @@ int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir, buf_info->len = len; mhi_tre = tre_ring->wp; + bei = !!(mhi_chan->intmod); mhi_tre->ptr =MHI_TRE_DATA_PTR (buf_info->p_addr); mhi_tre->dword[0 ] =MHI_TRE_DATA_DWORD0 (buf_info->len); - mhi_tre->dword[1 ] =MHI_TRE_DATA_DWORD1 (1 ,1 ,0 ,0 ); + mhi_tre->dword[1 ] =MHI_TRE_DATA_DWORD1 (bei,1 ,0 ,0 );/* increment WP */ mhi_add_ring_element (mhi_cntrl, tre_ring);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 6/8 bus: mhi: core: Return appropriate error codes for AMSS load failure
In reply to Bhaumik BhattWhen loading AMSS firmware using BHIe protocol, return -ETIMEDOUT if no response is received within the timeout or return -EIO in case of a protocol returned failure or an MHI error state.
--- drivers/bus/mhi/core/boot.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
drivers/bus/mhi/core/boot.c +12 -11
@@ -176,6 +176,7 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl,void __iomem *base = mhi_cntrl->bhie;rwlock_t *pm_lock = &mhi_cntrl->pm_lock;u32 tx_status, sequence_id; +int ret;read_lock_bh (pm_lock);if (!MHI_REG_ACCESS_VALID (mhi_cntrl->pm_state)) {
@@ -198,19 +199,19 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl,read_unlock_bh (pm_lock);/* Wait for the image download to complete */ -wait_event_timeout (mhi_cntrl->state_event, -MHI_PM_IN_ERROR_STATE (mhi_cntrl->pm_state) || -mhi_read_reg_field (mhi_cntrl, base, -BHIE_TXVECSTATUS_OFFS , -BHIE_TXVECSTATUS_STATUS_BMSK , -BHIE_TXVECSTATUS_STATUS_SHFT , - &tx_status) || tx_status, -msecs_to_jiffies (mhi_cntrl->timeout_ms)); - -if (MHI_PM_IN_ERROR_STATE (mhi_cntrl->pm_state)) + ret =wait_event_timeout (mhi_cntrl->state_event, +MHI_PM_IN_ERROR_STATE (mhi_cntrl->pm_state) || +mhi_read_reg_field (mhi_cntrl, base, +BHIE_TXVECSTATUS_OFFS , +BHIE_TXVECSTATUS_STATUS_BMSK , +BHIE_TXVECSTATUS_STATUS_SHFT , + &tx_status) || tx_status, +msecs_to_jiffies (mhi_cntrl->timeout_ms)); +if (MHI_PM_IN_ERROR_STATE (mhi_cntrl->pm_state) || + tx_status !=BHIE_TXVECSTATUS_STATUS_XFER_COMPL )return -EIO ; -return (tx_status ==BHIE_TXVECSTATUS_STATUS_XFER_COMPL ) ?0 : -EIO ; +return (!ret) ? -ETIMEDOUT :0 ; } static int mhi_fw_load_sbl(struct mhi_controller *mhi_cntrl,
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 3/8 bus: mhi: core: Read transfer length from an event properly
In reply to Bhaumik BhattFrom: Hemant Kumar <[email protected]>
When MHI Driver receives an EOT event, it reads xfer_len from the event in the last TRE. The value is under control of the MHI device and never validated by Host MHI driver. The value should never be larger than the real size of the buffer but a malicious device can set the value 0xFFFF as maximum. This causes device to memory overflow (both read or write). Fix this issue by reading minimum of transfer length from event and the buffer length provided.
--- drivers/bus/mhi/core/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/bus/mhi/core/main.c +4 -1
@@ -521,7 +521,10 @@ static int parse_xfer_event(struct mhi_controller *mhi_cntrl, mhi_cntrl->unmap_single (mhi_cntrl, buf_info); result.buf_addr = buf_info->cb_buf; - result.bytes_xferd = xfer_len; + +/* truncate to buf len if xfer_len is larger */ + result.bytes_xferd = +min_t (u16, xfer_len, buf_info->len);mhi_del_ring_element (mhi_cntrl, buf_ring);mhi_del_ring_element (mhi_cntrl, tre_ring); local_rp = tre_ring->rp;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 4/8 bus: mhi: core: Handle firmware load using state worker
In reply to Bhaumik BhattUpon power up, driver queues firmware worker thread if the execution environment is PBL. Firmware worker is blocked with a timeout until state worker gets a chance to run and unblock firmware worker. An endpoint power up failure can be seen if state worker gets a chance to run after firmware worker has timed out. Remove this dependency and handle firmware load directly using state worker thread.
--- drivers/bus/mhi/core/boot.c | 18 +++--------------- drivers/bus/mhi/core/init.c | 1 - drivers/bus/mhi/core/internal.h | 1 + drivers/bus/mhi/core/pm.c | 6 +----- include/linux/mhi.h | 2 -- 5 files changed, 5 insertions(+), 23 deletions(-)
drivers/bus/mhi/core/boot.c +3 -15
@@ -377,30 +377,18 @@ static void mhi_firmware_copy(struct mhi_controller *mhi_cntrl, } } -void mhi_fw_load_worker (struct work_struct *work) +void mhi_fw_load_handler (struct mhi_controller *mhi_cntrl) { -struct mhi_controller *mhi_cntrl;const struct firmware *firmware =NULL ;struct image_info *image_info; -struct device *dev; +struct device *dev = &mhi_cntrl->mhi_dev->dev;const char *fw_name;void *buf;dma_addr_t dma_addr;size_t size;int ret; - mhi_cntrl = container_of(work, struct mhi_controller, fw_worker); - dev = &mhi_cntrl->mhi_dev->dev; - -dev_dbg (dev,"Waiting for device to enter PBL from: %s\n" , -TO_MHI_EXEC_STR (mhi_cntrl->ee)); - - ret =wait_event_timeout (mhi_cntrl->state_event, -MHI_IN_PBL (mhi_cntrl->ee) || -MHI_PM_IN_ERROR_STATE (mhi_cntrl->pm_state), -msecs_to_jiffies (mhi_cntrl->timeout_ms)); - -if (!ret ||MHI_PM_IN_ERROR_STATE (mhi_cntrl->pm_state)) { +if (MHI_PM_IN_ERROR_STATE (mhi_cntrl->pm_state)) {dev_err (dev,"Device MHI is not in valid state\n" );return ; }
drivers/bus/mhi/core/init.c +0 -1
@@ -836,7 +836,6 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,spin_lock_init (&mhi_cntrl->wlock);INIT_WORK (&mhi_cntrl->st_worker, mhi_pm_st_worker);INIT_WORK (&mhi_cntrl->syserr_worker, mhi_pm_sys_err_worker); -INIT_WORK (&mhi_cntrl->fw_worker, mhi_fw_load_worker);init_waitqueue_head (&mhi_cntrl->state_event); mhi_cmd = mhi_cntrl->mhi_cmd;
drivers/bus/mhi/core/internal.h +1 -0
@@ -630,6 +630,7 @@ void mhi_ring_chan_db(struct mhi_controller *mhi_cntrl,void mhi_deinit_free_irq (struct mhi_controller *mhi_cntrl);void mhi_rddm_prepare (struct mhi_controller *mhi_cntrl,struct image_info *img_info); +void mhi_fw_load_handler (struct mhi_controller *mhi_cntrl);int mhi_prepare_channel (struct mhi_controller *mhi_cntrl,struct mhi_chan *mhi_chan); int mhi_init_chan_ctxt(struct mhi_controller *mhi_cntrl,
drivers/bus/mhi/core/pm.c +1 -5
@@ -528,7 +528,6 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl,dev_dbg (dev,"Waiting for all pending threads to complete\n" );wake_up_all (&mhi_cntrl->state_event);flush_work (&mhi_cntrl->st_worker); -flush_work (&mhi_cntrl->fw_worker);dev_dbg (dev,"Reset all active channels and remove MHI devices\n" );device_for_each_child (mhi_cntrl->cntrl_dev,NULL , mhi_destroy_device);
@@ -643,7 +642,7 @@ void mhi_pm_st_worker(struct work_struct *work) mhi_cntrl->ee =mhi_get_exec_env (mhi_cntrl);write_unlock_irq (&mhi_cntrl->pm_lock);if (MHI_IN_PBL (mhi_cntrl->ee)) -wake_up_all (&mhi_cntrl->state_event); +mhi_fw_load_handler (mhi_cntrl);break ;case DEV_ST_TRANSITION_SBL :write_lock_irq (&mhi_cntrl->pm_lock);
@@ -833,9 +832,6 @@ int mhi_async_power_up(struct mhi_controller *mhi_cntrl) next_state =MHI_IN_PBL (current_ee) ?DEV_ST_TRANSITION_PBL :DEV_ST_TRANSITION_READY ; -if (next_state ==DEV_ST_TRANSITION_PBL ) -schedule_work (&mhi_cntrl->fw_worker); -mhi_queue_state_transition (mhi_cntrl, next_state);mutex_unlock (&mhi_cntrl->pm_mutex);
include/linux/mhi.h +0 -2
@@ -331,7 +331,6 @@ struct mhi_controller_config {* @wlock: Lock for protecting device wakeup * @mhi_link_info: Device bandwidth info * @st_worker: State transition worker -* @fw_worker: Firmware download worker * @syserr_worker: System error worker * @state_event: State change event * @status_cb: CB function to notify power states of the device (required)
@@ -411,7 +410,6 @@ struct mhi_controller {spinlock_t wlock;struct mhi_link_info mhi_link_info;struct work_struct st_worker; -struct work_struct fw_worker;struct work_struct syserr_worker;wait_queue_head_t state_event;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 5/8 bus: mhi: core: WARN_ON for malformed vector table
In reply to Bhaumik BhattAdd a bounds check in the firmware copy routine to exit if a malformed vector table is found while attempting to load the firmware in to the BHIe vector table.
--- drivers/bus/mhi/core/boot.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/bus/mhi/core/boot.c +6 -0
@@ -362,8 +362,14 @@ static void mhi_firmware_copy(struct mhi_controller *mhi_cntrl,int i =0 ;struct mhi_buf *mhi_buf = img_info->mhi_buf;struct bhi_vec_entry *bhi_vec = img_info->bhi_vec; +struct device *dev = &mhi_cntrl->mhi_dev->dev;while (remainder) { +if (WARN_ON (i >= img_info->entries)) { +dev_err (dev,"Malformed vector table\n" ); +return ; + } + to_cpy =min (remainder, mhi_buf->len);memcpy (mhi_buf->buf, buf, to_cpy); bhi_vec->dma_addr = mhi_buf->dma_addr;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 7/8 bus: mhi: core: Improve debug logs for loading firmware
In reply to Bhaumik BhattAdd log messages to track boot flow errors and timeouts in SBL or AMSS firmware loading to aid in debug.
--- drivers/bus/mhi/core/boot.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/bus/mhi/core/boot.c +18 -3
@@ -121,7 +121,8 @@ static int __mhi_download_rddm_in_panic(struct mhi_controller *mhi_cntrl) ee =mhi_get_exec_env (mhi_cntrl); } -dev_dbg (dev,"Waiting for image download completion, current EE: %s\n" , +dev_dbg (dev, +"Waiting for RDDM image download via BHIe, current EE:%s\n" ,TO_MHI_EXEC_STR (ee));while (retry--) {
@@ -152,11 +153,14 @@ static int __mhi_download_rddm_in_panic(struct mhi_controller *mhi_cntrl)int mhi_download_rddm_img (struct mhi_controller *mhi_cntrl,bool in_panic) {void __iomem *base = mhi_cntrl->bhie; +struct device *dev = &mhi_cntrl->mhi_dev->dev;u32 rx_status;if (in_panic)return __mhi_download_rddm_in_panic (mhi_cntrl); +dev_dbg (dev,"Waiting for RDDM image download via BHIe\n" ); +/* Wait for the image download to complete */ wait_event_timeout(mhi_cntrl->state_event, mhi_read_reg_field(mhi_cntrl, base,
@@ -174,6 +178,7 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl, const struct mhi_buf *mhi_buf) {void __iomem *base = mhi_cntrl->bhie; +struct device *dev = &mhi_cntrl->mhi_dev->dev;rwlock_t *pm_lock = &mhi_cntrl->pm_lock;u32 tx_status, sequence_id;int ret;
@@ -184,6 +189,7 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl,return -EIO ; } +dev_dbg (dev,"Starting AMSS download via BHIe\n" );mhi_write_reg (mhi_cntrl, base,BHIE_TXVECADDR_HIGH_OFFS ,upper_32_bits (mhi_buf->dma_addr));
@@ -441,7 +447,12 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)release_firmware (firmware);/* Error or in EDL mode, we're done */ -if (ret || mhi_cntrl->ee ==MHI_EE_EDL ) +if (ret) { +dev_err (dev,"MHI did not load SBL, ret:%d\n" , ret); +return ; + } + +if (mhi_cntrl->ee ==MHI_EE_EDL )return ;write_lock_irq (&mhi_cntrl->pm_lock);
@@ -469,8 +480,10 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)if (!mhi_cntrl->fbc_download)return ; -if (ret) +if (ret) { +dev_err (dev,"MHI did not enter READY state\n" ); goto error_read; + }/* Wait for the SBL event */ ret = wait_event_timeout(mhi_cntrl->state_event,
@@ -488,6 +501,8 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) ret =mhi_fw_load_amss (mhi_cntrl,/* Vector table is the last entry */ &image_info->mhi_buf[image_info->entries -1 ]); +if (ret) +dev_err (dev,"MHI did not load AMSS, ret:%d\n" , ret);release_firmware (firmware);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v1 2/8] bus: mhi: core: Add range check for channel id received in event ring
In reply to Bhaumik BhattQuoted 9 lines · Bhaumik Bhatt
From: Hemant Kumar <[email protected]>
MHI data completion handler function reads channel id from event ring element. Value is under the control of MHI devices and can be any value between 0 and 255. In order to prevent out of bound access add a bound check against the max channel supported by controller and skip processing of that event ring element.
Signed-off-by Hemant Kumar <[email protected]>
I believe your SOB is needed here after Hemant's per section 11 of Documentation/process/submitting-patches.rst
Quoted 10 lines
--- drivers/bus/mhi/core/main.c | 3 +++ 1 file changed, 3 insertions(+)drivers/bus/mhi/core/main.c +0
-0
drivers/bus/mhi/core/main.c int mhi_process_data_event_ring(struct mhi_controller *mhi_cntrl, · line 835
Quoted 9 lines
drivers/bus/mhi/core/main.c +3
-0@@ -827,6 +827,9 @@ int mhi_process_data_event_ring(struct mhi_controller *mhi_cntrl,enum mhi_pkt_type type =MHI_TRE_GET_EV_TYPE (local_rp); chan =MHI_TRE_GET_EV_CHID (local_rp); +if (WARN_ON (chan >= mhi_cntrl->max_chan)) +continue ; + mhi_chan = &mhi_cntrl->mhi_chan[chan];if (likely (type ==MHI_PKT_TYPE_TX_EVENT )) {
How does this work?
I understand the need for the range check, however I looks like this change doesn't do proper handling.
Since all you do is "continue", we'll remain stuck in the while loop this exists in, continuously "processing" the same event, failing the same check, and spamming the kernel log with the WARN_ON output until the end of time.
What am I missing?
What is the behavior you want? Do you want to just drop/ignore the invalid event, or issue a reset of the device because it is clearly misbehaving?
Signature · 3 lines
Jeffrey Hugo Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v1 2/8] bus: mhi: core: Add range check for channel id received in event ring
Quoted 34 lines · Jeffrey Hugo
Quoted 9 lines · Bhaumik Bhatt
From: Hemant Kumar <[email protected]>
MHI data completion handler function reads channel id from event ring element. Value is under the control of MHI devices and can be any value between 0 and 255. In order to prevent out of bound access add a bound check against the max channel supported by controller and skip processing of that event ring element.
Signed-off-by Hemant Kumar <[email protected]>I believe your SOB is needed here after Hemant's per section 11 of
Documentation/process/submitting-patches.rstQuoted 9 lines
---
drivers/bus/mhi/core/main.c| 3 +++1 file changed, 3 insertions(+)drivers/bus/mhi/core/main.c +0
-0drivers/bus/mhi/core/main.c int mhi_process_data_event_ring(struct · line 835
Quoted 9 lines
drivers/bus/mhi/core/main.c +3
-0@@ -827,6 +827,9 @@ int mhi_process_data_event_ring(struct mhi_controller *mhi_cntrl, enum mhi_pkt_type type = MHI_TRE_GET_EV_TYPE(local_rp); chan = MHI_TRE_GET_EV_CHID(local_rp); + if (WARN_ON(chan >= mhi_cntrl->max_chan)) + continue; + mhi_chan = &mhi_cntrl->mhi_chan[chan]; if (likely(type == MHI_PKT_TYPE_TX_EVENT)) {How does this work?
Quoted 5 lines
I understand the need for the range check, however I looks like this change doesn't do proper handling.
Since all you do is "continue", we'll remain stuck in the while loop this exists in, continuously "processing" the same event, failing the same check, and spamming the kernel log with the
WARN_ONoutput until the end of time.What am I missing?
Idea was to drop the event and continue, but continue statement is wrong here, we need to recycle the event and continue after that. Will fix in V2.
Quoted 3 lines
What is the behavior you want? Do you want to just drop/ignore the invalid event, or issue a reset of the device because it is clearly misbehaving?
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project