diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/ipmr.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index d2e3b3ef039e..3ef30cf57f4a 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -266,7 +266,7 @@ static int __net_init ipmr_rules_init(struct net *net) | |||
266 | return 0; | 266 | return 0; |
267 | 267 | ||
268 | err2: | 268 | err2: |
269 | kfree(mrt); | 269 | ipmr_free_table(mrt); |
270 | err1: | 270 | err1: |
271 | fib_rules_unregister(ops); | 271 | fib_rules_unregister(ops); |
272 | return err; | 272 | return err; |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 5aababa20a21..69f9cf684744 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1469,7 +1469,7 @@ void tcp_v4_early_demux(struct sk_buff *skb) | |||
1469 | skb->sk = sk; | 1469 | skb->sk = sk; |
1470 | skb->destructor = sock_edemux; | 1470 | skb->destructor = sock_edemux; |
1471 | if (sk_fullsock(sk)) { | 1471 | if (sk_fullsock(sk)) { |
1472 | struct dst_entry *dst = sk->sk_rx_dst; | 1472 | struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst); |
1473 | 1473 | ||
1474 | if (dst) | 1474 | if (dst) |
1475 | dst = dst_check(dst, 0); | 1475 | dst = dst_check(dst, 0); |