Skip to content

Commit f177ea4

Browse files
committed
Merge: mpls: stable backport for 10.2 phase 1
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1529 JIRA: https://issues.redhat.com/browse/RHEL-115575 Upstream Status: linux.git A simple MPLS fix. Signed-off-by: Guillaume Nault <gnault@redhat.com> Approved-by: Antoine Tenart <atenart@redhat.com> Approved-by: Hangbin Liu <haliu@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Scott Weaver <scweaver@redhat.com>
2 parents f59930c + 8b6e769 commit f177ea4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/mpls/af_mpls.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ static struct mpls_route *mpls_route_input_rcu(struct net *net, unsigned index)
8181

8282
if (index < net->mpls.platform_labels) {
8383
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]);
8686
}
8787
return rt;
8888
}

0 commit comments

Comments
 (0)