android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "bus: mhi: misc: Add check for dev_rp if it is iommu range or not"

Browse Source
This commit is contained in:
qctecmdr 2023-08-25 10:57:10 -07:00 committed by Gerrit - the friendly Code Review server
commit e261b56f29
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/bus/mhi/host/internal.h
View File

@ -310,6 +310,12 @@ static inline void mhi_trigger_resume(struct mhi_controller *mhi_cntrl)
mhi_cntrl->runtime_put(mhi_cntrl);
}
static inline bool is_valid_ring_ptr(struct mhi_ring *ring, dma_addr_t addr)
{
return ((addr >= ring->iommu_base &&
addr < ring->iommu_base + ring->len) && (addr % 16 == 0));
}
/* Register access methods */
void mhi_db_brstmode(struct mhi_controller *mhi_cntrl, struct db_cfg *db_cfg,
void __iomem *db_addr, dma_addr_t db_val);

5
drivers/bus/mhi/host/main.c
View File

@ -271,11 +271,6 @@ static void mhi_del_ring_element(struct mhi_controller *mhi_cntrl,
smp_wmb();
}
static bool is_valid_ring_ptr(struct mhi_ring *ring, dma_addr_t addr)
{
return addr >= ring->iommu_base && addr < ring->iommu_base + ring->len;
}
int mhi_destroy_device(struct device *dev, void *data)
{
struct mhi_chan *ul_chan, *dl_chan;

13
drivers/bus/mhi/host/misc.c
View File

@ -1356,6 +1356,13 @@ int mhi_process_misc_tsync_ev_ring(struct mhi_controller *mhi_cntrl,
int ret = 0;
spin_lock_bh(&mhi_event->lock);
if (!is_valid_ring_ptr(ev_ring, er_ctxt->rp)) {
MHI_ERR(dev, "Event ring rp points outside of the event ring or unalign rp %llx\n",
er_ctxt->rp);
spin_unlock_bh(&mhi_event->lock);
goto exit_tsync_process;
}
dev_rp = mhi_misc_to_virtual(ev_ring, er_ctxt->rp);
if (ev_ring->rp == dev_rp) {
spin_unlock_bh(&mhi_event->lock);
@ -1461,6 +1468,12 @@ int mhi_process_misc_bw_ev_ring(struct mhi_controller *mhi_cntrl,
goto exit_bw_scale_process;
spin_lock_bh(&mhi_event->lock);
if (!is_valid_ring_ptr(ev_ring, er_ctxt->rp)) {
MHI_ERR(dev, "Event ring rp points outside of the event ring or unalign rp %llx\n",
er_ctxt->rp);
spin_unlock_bh(&mhi_event->lock);
return 0;
}
dev_rp = mhi_misc_to_virtual(ev_ring, er_ctxt->rp);
/**