ipv6 addrlabel: permit deletion of labels assigned to removed dev
Subsystems (3)
PATCH 1/1 ipv6 addrlabel: permit deletion of labels assigned to removed dev
as addrlabels with an interface index are left alone when the interface gets removed this results in addrlabels that can no longer be removed.
Restrict validation of index to adding new addrlabels.
Signed-off-by Florian Westphal <[email protected]>
--- net/ipv6/addrlabel.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
net/ipv6/addrlabel.c +4 -4
@@ -421,10 +421,6 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh, ifal->ifal_prefixlen > 128)return -EINVAL ; -if (ifal->ifal_index && - !__dev_get_by_index (net, ifal->ifal_index)) -return -EINVAL ; -if (!tb[IFAL_ADDRESS ])return -EINVAL ;
@@ -440,6 +436,10 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh,switch (nlh->nlmsg_type) {case RTM_NEWADDRLABEL : +if (ifal->ifal_index && + !__dev_get_by_index (net, ifal->ifal_index)) +return -EINVAL ; + err =ip6addrlbl_add (net, pfx, ifal->ifal_prefixlen, ifal->ifal_index, label, nlh->nlmsg_flags &NLM_F_REPLACE );
Signature · 1 line
1.6.4.4
From: Florian Westphal <[email protected]>
Date: Fri, 7 May 2010 23:31:33 +0200
Quoted 7 lines
as addrlabels with an interface index are left alone when the interface gets removed this results in addrlabels that can no longer be removed.
Restrict validation of index to adding new addrlabels.
Signed-off-by Florian Westphal <[email protected]>
Applied, thanks Florian.