From: Scott Mayhew <smayhew@redhat.com>
Date: Thu, 5 Jan 2017 21:34:50 +0000 (-0500)
Subject: lockd: initialize sin6_scope_id in lockd_inet6addr_event()
X-Git-Tag: rel_imx_4.19.35_1.1.0~13049^2~28
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=c01410f7f6fd476072c9a71241938c24bed8b6f9;p=linux.git

lockd: initialize sin6_scope_id in lockd_inet6addr_event()

I noticed this was missing when I was testing with link local addresses.

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 1c13dd80744f..7e4ea3b9f472 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -322,6 +322,8 @@ static int lockd_inet6addr_event(struct notifier_block *this,
 		dprintk("lockd_inet6addr_event: removed %pI6\n", &ifa->addr);
 		sin6.sin6_family = AF_INET6;
 		sin6.sin6_addr = ifa->addr;
+		if (ipv6_addr_type(&sin6.sin6_addr) & IPV6_ADDR_LINKLOCAL)
+			sin6.sin6_scope_id = ifa->idev->dev->ifindex;
 		svc_age_temp_xprts_now(nlmsvc_rqst->rq_server,
 			(struct sockaddr *)&sin6);
 	}