diff options
author | Jarek Poplawski <jarkao2@o2.pl> | 2007-03-08 14:43:41 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-03-08 14:43:41 -0800 |
commit | e2eb8d452827b8d1f73db384cd7c6482eac29478 (patch) | |
tree | f54eb5b8fee852dc1e670cd3c10efe751f4e4434 | |
parent | ca4266359d0c1199af088447f209ab5bcc32a989 (diff) | |
download | op-kernel-dev-e2eb8d452827b8d1f73db384cd7c6482eac29478.zip op-kernel-dev-e2eb8d452827b8d1f73db384cd7c6482eac29478.tar.gz |
[SCTP] ipv6: inconsistent lock state ipv6_add_addr/sctp_v6_copy_addrlist
lockdep found that dev->lock taken from softirq in ipv6_add_addr
is also taken in sctp_v6_copy_addrlist with softirqs enabled, so
lockup is possible.
Noticed-by: Simon Arlott <simon@arlott.org>
Signed-off-by: Jarek Poplawski <jarkao2@o2.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/sctp/ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 63fe109..0b9c49b 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -360,7 +360,7 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist, return; } - read_lock(&in6_dev->lock); + read_lock_bh(&in6_dev->lock); for (ifp = in6_dev->addr_list; ifp; ifp = ifp->if_next) { /* Add the address to the local list. */ addr = t_new(struct sctp_sockaddr_entry, GFP_ATOMIC); @@ -374,7 +374,7 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist, } } - read_unlock(&in6_dev->lock); + read_unlock_bh(&in6_dev->lock); rcu_read_unlock(); } |