Merge: mpls: stable backport for 9.8 phase 2

CKI KWF Bot · CKI KWF Bot · commit a1694ffc83ad · 2025-10-02T00:15:23.000Z
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7397 JIRA: https://issues.redhat.com/browse/RHEL-115623 Upstream Status: linux.git A simple MPLS fix. Signed-off-by: Guillaume Nault <gnault@redhat.com> Approved-by: Florian Westphal <fwestpha@redhat.com> Approved-by: Hangbin Liu <haliu@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
@@ -81,8 +81,8 @@ static struct mpls_route *mpls_route_input_rcu(struct net *net, unsigned index)
 
 	if (index < net->mpls.platform_labels) {
 		struct mpls_route __rcu **platform_label =
-			rcu_dereference(net->mpls.platform_label);
-		rt = rcu_dereference(platform_label[index]);
+			rcu_dereference_rtnl(net->mpls.platform_label);
+		rt = rcu_dereference_rtnl(platform_label[index]);
 	}
 	return rt;
 }

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ static struct mpls_route mpls_route_input_rcu(struct net net, unsigned index)`
`81`	`81`
`82`	`82`	`if (index < net->mpls.platform_labels) {`
`83`	`83`	`struct mpls_route __rcu **platform_label =`
`84`		`- rcu_dereference(net->mpls.platform_label);`
`85`		`- rt = rcu_dereference(platform_label[index]);`
	`84`	`+ rcu_dereference_rtnl(net->mpls.platform_label);`
	`85`	`+ rt = rcu_dereference_rtnl(platform_label[index]);`
`86`	`86`	`}`
`87`	`87`	`return rt;`
`88`	`88`	`}`