- sctp-ipv6-inconsistent-lock-state-ipv6_add_addr-sctp_v6_copy_addrlist.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     SCTP: ipv6: inconsistent lock state ipv6_add_addr/sctp_v6_copy_addrlist
has been removed from the -mm tree.  Its filename was
     sctp-ipv6-inconsistent-lock-state-ipv6_add_addr-sctp_v6_copy_addrlist.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: SCTP: ipv6: inconsistent lock state ipv6_add_addr/sctp_v6_copy_addrlist
From: Jarek Poplawski <jarkao2@xxxxx>

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@xxxxxxxxxx>
Signed-off-by: Jarek Poplawski <jarkao2@xxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 net/sctp/ipv6.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN net/sctp/ipv6.c~sctp-ipv6-inconsistent-lock-state-ipv6_add_addr-sctp_v6_copy_addrlist net/sctp/ipv6.c
--- a/net/sctp/ipv6.c~sctp-ipv6-inconsistent-lock-state-ipv6_add_addr-sctp_v6_copy_addrlist
+++ a/net/sctp/ipv6.c
@@ -360,7 +360,7 @@ static void sctp_v6_copy_addrlist(struct
 		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
 		}
 	}
 
-	read_unlock(&in6_dev->lock);
+	read_unlock_bh(&in6_dev->lock);
 	rcu_read_unlock();
 }
 
_

Patches currently in -mm which might be from jarkao2@xxxxx are

origin.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux