forked from Minki/linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [SCTP] ipv6: inconsistent lock state ipv6_add_addr/sctp_v6_copy_addrlist
This commit is contained in:
commit
c5bfdb7261
@ -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();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user