Skip to content

Commit a77955f

Browse files
quic-jhugogregkh
authored andcommitted
bus: mhi: host: Fix race between unprepare and queue_buf
commit 0686a81 upstream. A client driver may use mhi_unprepare_from_transfer() to quiesce incoming data during the client driver's tear down. The client driver might also be processing data at the same time, resulting in a call to mhi_queue_buf() which will invoke mhi_gen_tre(). If mhi_gen_tre() runs after mhi_unprepare_from_transfer() has torn down the channel, a panic will occur due to an invalid dereference leading to a page fault. This occurs because mhi_gen_tre() does not verify the channel state after locking it. Fix this by having mhi_gen_tre() confirm the channel state is valid, or return error to avoid accessing deinitialized data. Cc: stable@vger.kernel.org # 6.8 Fixes: b89b6a8 ("bus: mhi: host: Add spinlock to protect WP access when queueing TREs") Signed-off-by: Jeffrey Hugo <quic_jhugo@quicinc.com> Signed-off-by: Jeff Hugo <jeff.hugo@oss.qualcomm.com> Reviewed-by: Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com> Reviewed-by: Youssef Samir <quic_yabdulra@quicinc.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Reviewed-by: Troy Hanson <quic_thanson@quicinc.com> Link: https://lore.kernel.org/r/20250306172913.856982-1-jeff.hugo@oss.qualcomm.com [mani: added stable tag] Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7d12a7d commit a77955f

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

drivers/bus/mhi/host/main.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,11 +1207,16 @@ int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,
12071207
struct mhi_ring_element *mhi_tre;
12081208
struct mhi_buf_info *buf_info;
12091209
int eot, eob, chain, bei;
1210-
int ret;
1210+
int ret = 0;
12111211

12121212
/* Protect accesses for reading and incrementing WP */
12131213
write_lock_bh(&mhi_chan->lock);
12141214

1215+
if (mhi_chan->ch_state != MHI_CH_STATE_ENABLED) {
1216+
ret = -ENODEV;
1217+
goto out;
1218+
}
1219+
12151220
buf_ring = &mhi_chan->buf_ring;
12161221
tre_ring = &mhi_chan->tre_ring;
12171222

@@ -1229,10 +1234,8 @@ int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,
12291234

12301235
if (!info->pre_mapped) {
12311236
ret = mhi_cntrl->map_single(mhi_cntrl, buf_info);
1232-
if (ret) {
1233-
write_unlock_bh(&mhi_chan->lock);
1234-
return ret;
1235-
}
1237+
if (ret)
1238+
goto out;
12361239
}
12371240

12381241
eob = !!(flags & MHI_EOB);
@@ -1250,9 +1253,10 @@ int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,
12501253
mhi_add_ring_element(mhi_cntrl, tre_ring);
12511254
mhi_add_ring_element(mhi_cntrl, buf_ring);
12521255

1256+
out:
12531257
write_unlock_bh(&mhi_chan->lock);
12541258

1255-
return 0;
1259+
return ret;
12561260
}
12571261

12581262
int mhi_queue_buf(struct mhi_device *mhi_dev, enum dma_data_direction dir,

0 commit comments

Comments
 (0)