Commit a8da8e52 authored by Doug Oucharek's avatar Doug Oucharek Committed by Greg Kroah-Hartman

staging: lustre: o2iblnd: Fix crash in kiblnd_handle_early_rxs()

Under upstream staging commit 5a2ca43f, the list handling
code in kiblnd_handle_early_rxs() got changed to list_for_each_safe().
That protects against the current thread from deleting the current entry
it is looking at. It does not protect against another thread from deleting
the next item in the list (which the tmp variable points to). The way this
routine holds then releases a lock opens the door to other threads doing
just that.

This patch reverts this commit on this routine.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-9886
Fixes: 5a2ca43f ("Staging: lustre: Iterate list using list_for_each_entry")
Signed-off-by: default avatarDoug Oucharek <dougso@me.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fbae4707
...@@ -1965,13 +1965,14 @@ kiblnd_handle_early_rxs(struct kib_conn *conn) ...@@ -1965,13 +1965,14 @@ kiblnd_handle_early_rxs(struct kib_conn *conn)
{ {
unsigned long flags; unsigned long flags;
struct kib_rx *rx; struct kib_rx *rx;
struct kib_rx *tmp;
LASSERT(!in_interrupt()); LASSERT(!in_interrupt());
LASSERT(conn->ibc_state >= IBLND_CONN_ESTABLISHED); LASSERT(conn->ibc_state >= IBLND_CONN_ESTABLISHED);
write_lock_irqsave(&kiblnd_data.kib_global_lock, flags); write_lock_irqsave(&kiblnd_data.kib_global_lock, flags);
list_for_each_entry_safe(rx, tmp, &conn->ibc_early_rxs, rx_list) { while (!list_empty(&conn->ibc_early_rxs)) {
rx = list_entry(conn->ibc_early_rxs.next,
struct kib_rx, rx_list);
list_del(&rx->rx_list); list_del(&rx->rx_list);
write_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags); write_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment