* [PATCH 1/1] ipv6 addrlabel: permit deletion of labels assigned to removed dev
@ 2010-05-07 21:31 Florian Westphal
2010-05-18 0:08 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2010-05-07 21:31 UTC (permalink / raw)
To: netdev; +Cc: Florian Westphal
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 <fw@strlen.de>
---
net/ipv6/addrlabel.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index 6ff73c4..8342296 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -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);
--
1.6.4.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] ipv6 addrlabel: permit deletion of labels assigned to removed dev
2010-05-07 21:31 [PATCH 1/1] ipv6 addrlabel: permit deletion of labels assigned to removed dev Florian Westphal
@ 2010-05-18 0:08 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-05-18 0:08 UTC (permalink / raw)
To: fw; +Cc: netdev
From: Florian Westphal <fw@strlen.de>
Date: Fri, 7 May 2010 23:31:33 +0200
> 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 <fw@strlen.de>
Applied, thanks Florian.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-18 0:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-07 21:31 [PATCH 1/1] ipv6 addrlabel: permit deletion of labels assigned to removed dev Florian Westphal
2010-05-18 0:08 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).