Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0771275b authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

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: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6811d58f

net/ipv6/addrlabel.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -422,10 +422,6 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh, 
	    ifal->ifal_prefixlen > 128)

	    ifal->ifal_prefixlen > 128)

		return -EINVAL;

		return -EINVAL;





	if (ifal->ifal_index &&

	    !__dev_get_by_index(net, ifal->ifal_index))

		return -EINVAL;



	if (!tb[IFAL_ADDRESS])

	if (!tb[IFAL_ADDRESS])

		return -EINVAL;

		return -EINVAL;
@@ -441,6 +437,10 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh, 




	switch(nlh->nlmsg_type) {

	switch(nlh->nlmsg_type) {

	case RTM_NEWADDRLABEL:

	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,

		err = ip6addrlbl_add(net, pfx, ifal->ifal_prefixlen,

				     ifal->ifal_index, label,

				     ifal->ifal_index, label,

				     nlh->nlmsg_flags & NLM_F_REPLACE);

				     nlh->nlmsg_flags & NLM_F_REPLACE);