Commit ceb736e1 authored by Zhang Qilong's avatar Zhang Qilong Committed by Jakub Kicinski
Browse files

ipv6: Fix error path to cancel the meseage 



genlmsg_cancel() needs to be called in the error path of
inet6_fill_ifmcaddr and inet6_fill_ifacaddr to cancel
the message.

Fixes: 6ecf4c37 ("ipv6: enable IFA_TARGET_NETNSID for RTM_GETADDR")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZhang Qilong <zhangqilong3@huawei.com>
Link: https://lore.kernel.org/r/20201112080950.1476302-1-zhangqilong3@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9c2e14b4

net/ipv6/addrconf.c

+6 −2
Original line number Diff line number Diff line
@@ -5022,8 +5022,10 @@ static int inet6_fill_ifmcaddr(struct sk_buff *skb, struct ifmcaddr6 *ifmca, 
		return -EMSGSIZE;



	if (args->netnsid >= 0 &&

	    nla_put_s32(skb, IFA_TARGET_NETNSID, args->netnsid))

	    nla_put_s32(skb, IFA_TARGET_NETNSID, args->netnsid)) {

		nlmsg_cancel(skb, nlh);

		return -EMSGSIZE;

	}



	put_ifaddrmsg(nlh, 128, IFA_F_PERMANENT, scope, ifindex);

	if (nla_put_in6_addr(skb, IFA_MULTICAST, &ifmca->mca_addr) < 0 ||
@@ -5054,8 +5056,10 @@ static int inet6_fill_ifacaddr(struct sk_buff *skb, struct ifacaddr6 *ifaca, 
		return -EMSGSIZE;



	if (args->netnsid >= 0 &&

	    nla_put_s32(skb, IFA_TARGET_NETNSID, args->netnsid))

	    nla_put_s32(skb, IFA_TARGET_NETNSID, args->netnsid)) {

		nlmsg_cancel(skb, nlh);

		return -EMSGSIZE;

	}



	put_ifaddrmsg(nlh, 128, IFA_F_PERMANENT, scope, ifindex);

	if (nla_put_in6_addr(skb, IFA_ANYCAST, &ifaca->aca_addr) < 0 ||