diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-07-31 16:53:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-31 17:41:02 -0400 |
commit | f93f3c4ee48727713c3349b659adf8048fd4524b (patch) | |
tree | 28f871e0aad6131c5c3d9297f3fa7fb202363018 /drivers/rapidio/rio.c | |
parent | 4e5052948110140f1628dd986e27912b0e6b2065 (diff) |
rapidio: fix use after free in rio_unregister_scan()
We're freeing the list iterator so we can't move to the next entry.
Since there is only one matching mport_id, we can just break after
finding it.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Ryan Mallon <rmallon@gmail.com>
Acked-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rapidio/rio.c')
-rw-r--r-- | drivers/rapidio/rio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c index f4f30af2df68..2e8a20cac588 100644 --- a/drivers/rapidio/rio.c +++ b/drivers/rapidio/rio.c | |||
@@ -1715,11 +1715,13 @@ int rio_unregister_scan(int mport_id, struct rio_scan *scan_ops) | |||
1715 | (mport_id == RIO_MPORT_ANY && port->nscan == scan_ops)) | 1715 | (mport_id == RIO_MPORT_ANY && port->nscan == scan_ops)) |
1716 | port->nscan = NULL; | 1716 | port->nscan = NULL; |
1717 | 1717 | ||
1718 | list_for_each_entry(scan, &rio_scans, node) | 1718 | list_for_each_entry(scan, &rio_scans, node) { |
1719 | if (scan->mport_id == mport_id) { | 1719 | if (scan->mport_id == mport_id) { |
1720 | list_del(&scan->node); | 1720 | list_del(&scan->node); |
1721 | kfree(scan); | 1721 | kfree(scan); |
1722 | break; | ||
1722 | } | 1723 | } |
1724 | } | ||
1723 | 1725 | ||
1724 | mutex_unlock(&rio_mport_list_lock); | 1726 | mutex_unlock(&rio_mport_list_lock); |
1725 | 1727 | ||