diff mbox

ipv6:Fix concurrent access issue in the function inet6_rtm_deladdr

Message ID 1438742340-28451-1-git-send-email-uboot477@gmail.com
State Rejected, archived
Delegated to: David Miller
Headers show

Commit Message

Nicholas Krause Aug. 5, 2015, 2:39 a.m. UTC
From: Nicholas Krause <xerofoify@gmail.com>

This fixes the issue with conncurrent access when calling the function
inte6_addr_del due to this function using non locked wrapper versions
of certain functions by locking the routing mutex before and after this
call with rtnl_lock/unlock. After the unlocking just return the error
code as normal to signal success or failure to the caller of the function
inet_6_rtm_addr.

Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
 net/ipv6/addrconf.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Cong Wang Aug. 5, 2015, 3:54 a.m. UTC | #1
On Tue, Aug 4, 2015 at 7:39 PM, Nicholas Krause <uboot477@gmail.com> wrote:
> From: Nicholas Krause <xerofoify@gmail.com>
>
> This fixes the issue with conncurrent access when calling the function
> inte6_addr_del due to this function using non locked wrapper versions
> of certain functions by locking the routing mutex before and after this
> call with rtnl_lock/unlock. After the unlocking just return the error
> code as normal to signal success or failure to the caller of the function
> inet_6_rtm_addr.
>

Huh? Isn't inet6_rtm_deladdr() already called with rtnl lock?

What bug are you trying to fix?
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 21c2c81..b6103e0 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4006,8 +4006,11 @@  inet6_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh)
 	/* We ignore other flags so far. */
 	ifa_flags &= IFA_F_MANAGETEMPADDR;
 
-	return inet6_addr_del(net, ifm->ifa_index, ifa_flags, pfx,
+	rtnl_lock();
+	err =  inet6_addr_del(net, ifm->ifa_index, ifa_flags, pfx,
 			      ifm->ifa_prefixlen);
+	rtnl_unlock();
+	return err;
 }
 
 static int inet6_addr_modify(struct inet6_ifaddr *ifp, u32 ifa_flags,