bus: mhi: ep: Fix off by one in mhi_ep_process_cmd_ring()
Subsystems (3)
PATCH 1/1 bus: mhi: ep: Fix off by one in mhi_ep_process_cmd_ring()
The > comparison should be changed to >= to prevent an out of bounds access into the mhi_cntrl->mhi_chan[] array. The mhi_cntrl->mhi_chan[] array is allocated in mhi_ep_chan_init() and has mhi_cntrl->max_chan elements.
--- drivers/bus/mhi/ep/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/mhi/ep/main.c +1 -1
@@ -125,7 +125,7 @@ static int mhi_ep_process_cmd_ring(struct mhi_ep_ring *ring, struct mhi_ring_ele ch_id =MHI_TRE_GET_CMD_CHID (el);/* Check if the channel is supported by the controller */ -if ((ch_id > mhi_cntrl->max_chan) || !mhi_cntrl->mhi_chan[ch_id].name) { +if ((ch_id >= mhi_cntrl->max_chan) || !mhi_cntrl->mhi_chan[ch_id].name) {dev_err (dev,"Channel (%u) not supported!\n" , ch_id);return -ENODEV ; }
Signature · 1 line
2.35.1
Quoted 4 lines · Dan Carpenter
The > comparison should be changed to >= to prevent an out of bounds access into the mhi_cntrl->mhi_chan[] array. The mhi_cntrl->mhi_chan[] array is allocated in
mhi_ep_chan_init()and hasmhi_cntrl->max_chanelements.
You're right. I scanned through that file and there are other spots that don't check that the channel ID is in range, though I think this is the one where it's reading it from an external source. I.e., the other places are aleady known to be correct. (Maybe Mani can comment.)
Quoted 20 lines
Fixes 2527ad44ddb2 ("bus: mhi: ep: Check if the channel is supported by the controller")Signed-off-by Dan Carpenter <[email protected]>--- drivers/bus/mhi/ep/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/bus/mhi/ep/main.c +1
-1@@ -125,7 +125,7 @@ static int mhi_ep_process_cmd_ring(struct mhi_ep_ring *ring, struct mhi_ring_ele ch_id =MHI_TRE_GET_CMD_CHID (el);/* Check if the channel is supported by the controller */ -if ((ch_id > mhi_cntrl->max_chan) || !mhi_cntrl->mhi_chan[ch_id].name) { +if ((ch_id >= mhi_cntrl->max_chan) || !mhi_cntrl->mhi_chan[ch_id].name) {dev_err (dev,"Channel (%u) not supported!\n" , ch_id);return -ENODEV ; }
Quoted 7 lines · Dan Carpenter
The > comparison should be changed to >= to prevent an out of bounds access into the mhi_cntrl->mhi_chan[] array. The mhi_cntrl->mhi_chan[] array is allocated in
mhi_ep_chan_init()and hasmhi_cntrl->max_chanelements.Fixes 2527ad44ddb2 ("bus: mhi: ep: Check if the channel is supported by the controller")Signed-off-by Dan Carpenter <[email protected]>
Thanks,
Mani
Quoted 20 lines
--- drivers/bus/mhi/ep/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/bus/mhi/ep/main.c +1
-1@@ -125,7 +125,7 @@ static int mhi_ep_process_cmd_ring(struct mhi_ep_ring *ring, struct mhi_ring_ele ch_id =MHI_TRE_GET_CMD_CHID (el);/* Check if the channel is supported by the controller */ -if ((ch_id > mhi_cntrl->max_chan) || !mhi_cntrl->mhi_chan[ch_id].name) { +if ((ch_id >= mhi_cntrl->max_chan) || !mhi_cntrl->mhi_chan[ch_id].name) {dev_err (dev,"Channel (%u) not supported!\n" , ch_id);return -ENODEV ; }Signature · 1 line
2.35.1
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Manivannan Sadhasivam
maintainerQuoted 6 lines · Alex Elder
Quoted 4 lines · Dan Carpenter
The > comparison should be changed to >= to prevent an out of bounds access into the mhi_cntrl->mhi_chan[] array. The mhi_cntrl->mhi_chan[] array is allocated in
mhi_ep_chan_init()and hasmhi_cntrl->max_chanelements.
Quoted 7 lines
You're right. I scanned through that file and there are other spots that don't check that the channel ID is in range, though I think this is the one where it's reading it from an external source. I.e., the other places are aleady known to be correct. (Maybe Mani can comment.)
Right. This is the only place we get the channel id from the host, so that's why the check is needed only here.
Quoted 1 line
Reviewed-by Alex Elder <[email protected]>
Thanks,
Mani
Quoted 21 lines
Quoted 20 lines
Fixes 2527ad44ddb2 ("bus: mhi: ep: Check if the channel is supported by the controller")Signed-off-by Dan Carpenter <[email protected]>--- drivers/bus/mhi/ep/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/bus/mhi/ep/main.c +1
-1@@ -125,7 +125,7 @@ static int mhi_ep_process_cmd_ring(struct mhi_ep_ring *ring, struct mhi_ring_ele ch_id =MHI_TRE_GET_CMD_CHID (el);/* Check if the channel is supported by the controller */ -if ((ch_id > mhi_cntrl->max_chan) || !mhi_cntrl->mhi_chan[ch_id].name) { +if ((ch_id >= mhi_cntrl->max_chan) || !mhi_cntrl->mhi_chan[ch_id].name) {dev_err (dev,"Channel (%u) not supported!\n" , ch_id);return -ENODEV ; }
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Quoted 7 lines · Dan Carpenter
The > comparison should be changed to >= to prevent an out of bounds access into the mhi_cntrl->mhi_chan[] array. The mhi_cntrl->mhi_chan[] array is allocated in
mhi_ep_chan_init()and hasmhi_cntrl->max_chanelements.Fixes 2527ad44ddb2 ("bus: mhi: ep: Check if the channel is supported by the controller")Signed-off-by Dan Carpenter <[email protected]>
Applied to mhi-next!
Thanks,
Mani
Quoted 20 lines
--- drivers/bus/mhi/ep/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/bus/mhi/ep/main.c +1
-1@@ -125,7 +125,7 @@ static int mhi_ep_process_cmd_ring(struct mhi_ep_ring *ring, struct mhi_ring_ele ch_id =MHI_TRE_GET_CMD_CHID (el);/* Check if the channel is supported by the controller */ -if ((ch_id > mhi_cntrl->max_chan) || !mhi_cntrl->mhi_chan[ch_id].name) { +if ((ch_id >= mhi_cntrl->max_chan) || !mhi_cntrl->mhi_chan[ch_id].name) {dev_err (dev,"Channel (%u) not supported!\n" , ch_id);return -ENODEV ; }Signature · 1 line
2.35.1
Signature · 1 line
மணிவண்ணன் சதாசிவம்