staging: vchiq: Fix list_for_each exit tests
Subsystems (3)
PATCH 1/1 staging: vchiq: Fix list_for_each exit tests
This code code here used to be list_for_each() and after the loop then the "entry" pointer was non-NULL if we found the correct entry or NULL if we couldn't find it. Then we changed the code to use list_for_each_entry() and so now the "entry" pointer is always non-NULL when we exit the loop.
I have introduced a new "found" variable to say if we found the correct enty or not. I fixed one test by making it an else statement because that was more readable than testing "if (!found)".
--- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +7 -5
@@ -430,6 +430,7 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data,struct vchiq_service *service;enum vchiq_status status;struct bulk_waiter_node *waiter =NULL ; +bool found = false; service =find_service_by_handle (handle);if (!service)
@@ -443,12 +444,13 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data,list_for_each_entry (waiter, &instance->bulk_waiter_list, list) {if (waiter->pid = current->pid) {list_del (&waiter->list); + found = true;break ; } }mutex_unlock (&instance->bulk_waiter_list_mutex); -if (waiter) { +if (found) {struct vchiq_bulk *bulk = waiter->bulk_waiter.bulk;if (bulk) {
@@ -464,9 +466,7 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data,spin_unlock (&bulk_waiter_spinlock); } } - } - -if (!waiter) { + }else { waiter =kzalloc (sizeof (struct bulk_waiter_node ),GFP_KERNEL );if (!waiter) { vchiq_log_error(vchiq_core_log_level,
@@ -945,6 +945,7 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance, {struct vchiq_service *service;struct bulk_waiter_node *waiter =NULL ; +bool found = false;int status =0 ;int ret;
@@ -967,11 +968,12 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance, list) {if (waiter->pid = current->pid) {list_del (&waiter->list); + found = true;break ; } }mutex_unlock (&instance->bulk_waiter_list_mutex); -if (!waiter) { +if (!found) {vchiq_log_error (vchiq_arm_log_level,"no bulk_waiter found for pid %d" , current->pid);
Signature · 1 line
2.28.0
Greg Kroah-Hartman
maintainerQuoted 9 lines · Dan Carpenter
This code code here used to be
list_for_each()and after the loop then the "entry" pointer was non-NULL if we found the correct entry or NULL if we couldn't find it. Then we changed the code to uselist_for_each_entry()and so now the "entry" pointer is always non-NULL when we exit the loop.I have introduced a new "found" variable to say if we found the correct enty or not. I fixed one test by making it an else statement because that was more readable than testing "if (!found)".
Quoted 5 lines
Fixes 46e4b9ec4fa4 ("staging: vchiq_arm: use list_for_each_entry when accessing bulk_waiter_list")Signed-off-by Dan Carpenter <[email protected]>--- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
This doesn't apply against my tree, what branch did you make it against?
thanks,
greg k-h
PATCH v2 1/1 staging: vchiq: Fix list_for_each exit tests
After a list_for_each_entry() loop, the list iterator is always non-NULL so these conditions don't work. If the "waiter" is not found then this results in an out of bounds access.
I have fixed it by introducing a new "found" variable. In one case, I used an else statement for readability.
---
v2: rebase on latest linux-next
.../vc04_services/interface/vchiq_arm/vchiq_arm.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +7 -5
@@ -432,6 +432,7 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data,struct vchiq_service *service;enum vchiq_status status;struct bulk_waiter_node *waiter =NULL ; +bool found = false; service =find_service_by_handle (handle);if (!service)
@@ -445,12 +446,13 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data,list_for_each_entry (waiter, &instance->bulk_waiter_list, list) {if (waiter->pid = current->pid) {list_del (&waiter->list); + found = true;break ; } }mutex_unlock (&instance->bulk_waiter_list_mutex); -if (waiter) { +if (found) {struct vchiq_bulk *bulk = waiter->bulk_waiter.bulk;if (bulk) {
@@ -467,9 +469,7 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data,spin_unlock (&bulk_waiter_spinlock); } } - } - -if (!waiter) { + }else { waiter =kzalloc (sizeof (struct bulk_waiter_node ),GFP_KERNEL );if (!waiter) { vchiq_log_error(vchiq_core_log_level,
@@ -952,6 +952,7 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance, {struct vchiq_service *service;struct bulk_waiter_node *waiter =NULL ; +bool found = false;void *userdata;int status =0 ;int ret;
@@ -975,11 +976,12 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance, list) {if (waiter->pid = current->pid) {list_del (&waiter->list); + found = true;break ; } }mutex_unlock (&instance->bulk_waiter_list_mutex); -if (!waiter) { +if (!found) {vchiq_log_error (vchiq_arm_log_level,"no bulk_waiter found for pid %d" , current->pid);
Signature · 1 line
2.28.0
Quoted 10 lines · Dan Carpenter
After a
list_for_each_entry()loop, the list iterator is always non-NULL so these conditions don't work. If the "waiter" is not found then this results in an out of bounds access.I have fixed it by introducing a new "found" variable. In one case, I used an else statement for readability.
Fixes 46e4b9ec4fa4 ("staging: vchiq_arm: use list_for_each_entry when accessing bulk_waiter_list")Signed-off-by Dan Carpenter <[email protected]>---