1 files changed, 6 insertions, 4 deletions

diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index 2ab09cbae74d..06493736fbc8 100644
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -663,10 +663,13 @@ void tcp_fastopen_cache_get(struct sock *sk, u16 *mss,
 void tcp_fastopen_cache_set(struct sock *sk, u16 mss,
                             struct tcp_fastopen_cookie *cookie, bool syn_lost)
 {
+        struct dst_entry *dst = __sk_dst_get(sk);
         struct tcp_metrics_block *tm;
 
+        if (!dst)
+                return;
         rcu_read_lock();
-        tm = tcp_get_metrics(sk, __sk_dst_get(sk), true);
+        tm = tcp_get_metrics(sk, dst, true);
         if (tm) {
                 struct tcp_fastopen_metrics *tfom = &tm->tcpm_fastopen;
 
@@ -988,7 +991,7 @@ static int tcp_metrics_nl_cmd_del(struct sk_buff *skb, struct genl_info *info)
         return 0;
 }
 
-static struct genl_ops tcp_metrics_nl_ops[] = {
+static const struct genl_ops tcp_metrics_nl_ops[] = {
         {
                 .cmd = TCP_METRICS_CMD_GET,
                 .doit = tcp_metrics_nl_cmd_get,
@@ -1079,8 +1082,7 @@ void __init tcp_metrics_init(void)
         if (ret < 0)
                 goto cleanup;
         ret = genl_register_family_with_ops(&tcp_metrics_nl_family,
-                                            tcp_metrics_nl_ops,
-                                            ARRAY_SIZE(tcp_metrics_nl_ops));
+                                            tcp_metrics_nl_ops);
         if (ret < 0)
                 goto cleanup_subsys;
         return;