ADDRLABEL: Fix double free on label deletion.
Subsystems (3)
PATCH 1/1 ADDRLABEL: Fix double free on label deletion.
If an entry is being deleted because it has only one reference, we immediately delete it and blindly register the rcu handler for it, This results in oops by double freeing that object.
This patch fixes it by consolidating the code paths for the deletion; let its rcu handler delete the object if it has no more reference.
Bug was found by Mitsuru Chinen <[email protected]>
---
net/ipv6/addrlabel.c +6 -8
@@ -106,6 +106,11 @@ static inline void ip6addrlbl_free(struct ip6addrlbl_entry *p)kfree (p); } +static void ip6addrlbl_free_rcu (struct rcu_head *h) +{ +ip6addrlbl_free (container_of(h ,struct ip6addrlbl_entry ,rcu )); +} +static inline int ip6addrlbl_hold (struct ip6addrlbl_entry *p) {return atomic_inc_not_zero (&p->refcnt);
@@ -114,12 +119,7 @@ static inline int ip6addrlbl_hold(struct ip6addrlbl_entry *p)static inline void ip6addrlbl_put (struct ip6addrlbl_entry *p) {if (atomic_dec_and_test (&p->refcnt)) -ip6addrlbl_free (p); -} - -static void ip6addrlbl_free_rcu (struct rcu_head *h) -{ -ip6addrlbl_free (container_of(h ,struct ip6addrlbl_entry ,rcu )); +call_rcu (&p->rcu, ip6addrlbl_free_rcu); }/* Find label */
@@ -240,7 +240,6 @@ int __ip6addrlbl_add(struct ip6addrlbl_entry *newp, int replace) }hlist_replace_rcu (&p->list, &newp->list);ip6addrlbl_put (p); -call_rcu (&p->rcu, ip6addrlbl_free_rcu); goto out; }else if ((p->prefixlen == newp->prefixlen && !p->ifindex) || (p->prefixlen < newp->prefixlen)) {
@@ -300,7 +299,6 @@ int __ip6addrlbl_del(const struct in6_addr *prefix, int prefixlen, ipv6_addr_equal(&p->prefix, prefix)) {hlist_del_rcu (&p->list);ip6addrlbl_put (p); -call_rcu (&p->rcu, ip6addrlbl_free_rcu); ret =0 ;break ; }
Signature · 2 lines
YOSHIFUJI Hideaki @ USAGI Project <[email protected]> GPG-FP : 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA
From: YOSHIFUJI Hideaki / 吉藤英明 <[email protected]>
Date: Mon, 28 Jan 2008 21:02:22 +0900 (JST)
Quoted 10 lines
If an entry is being deleted because it has only one reference, we immediately delete it and blindly register the rcu handler for it, This results in oops by double freeing that object.
This patch fixes it by consolidating the code paths for the deletion; let its rcu handler delete the object if it has no more reference.
Bug was found by Mitsuru Chinen <[email protected]>
Signed-off-by YOSHIFUJI Hideaki <[email protected]>
Applied, thank you.
Quoted 8 lines · YOSHIFUJI Hideaki / 吉藤英明
If an entry is being deleted because it has only one reference, we immediately delete it and blindly register the rcu handler for it, This results in oops by double freeing that object.
This patch fixes it by consolidating the code paths for the deletion; let its rcu handler delete the object if it has no more reference.
Bug was found by Mitsuru Chinen <[email protected]>
Good catch!!!
Quoted 57 lines
Signed-off-by YOSHIFUJI Hideaki <[email protected]>---
net/ipv6/addrlabel.c +6
-8@@ -106,6 +106,11 @@ static inline void ip6addrlbl_free(struct ip6addrlbl_entry *p)kfree (p); } +static void ip6addrlbl_free_rcu (struct rcu_head *h) +{ +ip6addrlbl_free (container_of(h ,struct ip6addrlbl_entry ,rcu )); +} +static inline int ip6addrlbl_hold (struct ip6addrlbl_entry *p) {return atomic_inc_not_zero (&p->refcnt);@@ -114,12 +119,7 @@ static inline int ip6addrlbl_hold(struct ip6addrlbl_entry *p)static inline void ip6addrlbl_put (struct ip6addrlbl_entry *p) {if (atomic_dec_and_test (&p->refcnt)) -ip6addrlbl_free (p); -} - -static void ip6addrlbl_free_rcu (struct rcu_head *h) -{ -ip6addrlbl_free (container_of(h ,struct ip6addrlbl_entry ,rcu )); +call_rcu (&p->rcu, ip6addrlbl_free_rcu); }/* Find label */ @@ -240,7 +240,6 @@ int __ip6addrlbl_add(struct ip6addrlbl_entry *newp, int replace) }hlist_replace_rcu (&p->list, &newp->list);ip6addrlbl_put (p); -call_rcu (&p->rcu, ip6addrlbl_free_rcu); goto out; }else if ((p->prefixlen == newp->prefixlen && !p->ifindex) || (p->prefixlen < newp->prefixlen)) {@@ -300,7 +299,6 @@ int __ip6addrlbl_del(const struct in6_addr *prefix, int prefixlen, ipv6_addr_equal(&p->prefix, prefix)) {hlist_del_rcu (&p->list);ip6addrlbl_put (p); -call_rcu (&p->rcu, ip6addrlbl_free_rcu); ret =0 ;break ; }Signature · 7 lines
-- YOSHIFUJI Hideaki @ USAGI Project <[email protected]> GPG-FP : 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/1 add if_addrlabel.h to sanitized headers
In reply to YOSHIFUJI Hideaki / 吉藤英明if_addrlabel.h is needed for iproute2 usage.
--- include/linux/Kbuild | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
include/linux/Kbuild +1 -0
@@ -218,6 +218,7 @@ unifdef-y += i2c-dev.h unifdef-y += icmp.h unifdef-y += icmpv6.h unifdef-y += if_addr.h +unifdef-y += if_addrlabel.h unifdef-y += if_arp.h unifdef-y += if_bridge.h unifdef-y += if_ec.h
Signature · 1 line
1.5.3.8
Re: [PATCH] add if_addrlabel.h to sanitized headers
From: Stephen Hemminger <[email protected]>
Date: Thu, 31 Jan 2008 22:37:31 -0800
Quoted 3 lines
if_addrlabel.his needed for iproute2 usage.Signed-off-by Stephen Hemminger <[email protected]>
Applied, thanks.