diff options
| author | Andy Grover <andy.grover@oracle.com> | 2009-04-01 10:20:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-02 09:52:21 +0200 |
| commit | f1cffcbfcc53b825da7d1d26244aabd8dccb24aa (patch) | |
| tree | d71e3c271b29eecfc685b96ab0cf15404bd84ba5 /net/rds | |
| parent | Neterion: New driver: Kconfig and Makefile (diff) | |
| download | linux-f1cffcbfcc53b825da7d1d26244aabd8dccb24aa.tar.xz linux-f1cffcbfcc53b825da7d1d26244aabd8dccb24aa.zip | |
RDS: Fix m_rs_lock deadlock
rs_send_drop_to() is called during socket close. If it takes
m_rs_lock without disabling interrupts, then
rds_send_remove_from_sock() can run from the rx completion
handler and thus deadlock.
Signed-off-by: Andy Grover <andy.grover@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds')
| -rw-r--r-- | net/rds/send.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rds/send.c b/net/rds/send.c index 1b37364656f0..104fe033203d 100644 --- a/net/rds/send.c +++ b/net/rds/send.c @@ -615,7 +615,7 @@ void rds_send_drop_to(struct rds_sock *rs, struct sockaddr_in *dest) { struct rds_message *rm, *tmp; struct rds_connection *conn; - unsigned long flags; + unsigned long flags, flags2; LIST_HEAD(list); int wake = 0; @@ -651,9 +651,9 @@ void rds_send_drop_to(struct rds_sock *rs, struct sockaddr_in *dest) list_for_each_entry(rm, &list, m_sock_item) { /* We do this here rather than in the loop above, so that * we don't have to nest m_rs_lock under rs->rs_lock */ - spin_lock(&rm->m_rs_lock); + spin_lock_irqsave(&rm->m_rs_lock, flags2); rm->m_rs = NULL; - spin_unlock(&rm->m_rs_lock); + spin_unlock_irqrestore(&rm->m_rs_lock, flags2); /* * If we see this flag cleared then we're *sure* that someone |