Files
linux/include/linux
Wang Yufen ef9785f429 bpf, sockmap: Fix memleak in sk_psock_queue_msg
[ Upstream commit 938d3480b9 ]

If tcp_bpf_sendmsg is running during a tear down operation we may enqueue
data on the ingress msg queue while tear down is trying to free it.

 sk1 (redirect sk2)                         sk2
 -------------------                      ---------------
tcp_bpf_sendmsg()
 tcp_bpf_send_verdict()
  tcp_bpf_sendmsg_redir()
   bpf_tcp_ingress()
                                          sock_map_close()
                                           lock_sock()
    lock_sock() ... blocking
                                           sk_psock_stop
                                            sk_psock_clear_state(psock, SK_PSOCK_TX_ENABLED);
                                           release_sock(sk);
    lock_sock()
    sk_mem_charge()
    get_page()
    sk_psock_queue_msg()
     sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED);
      drop_sk_msg()
    release_sock()

While drop_sk_msg(), the msg has charged memory form sk by sk_mem_charge
and has sg pages need to put. To fix we use sk_msg_free() and then kfee()
msg.

This issue can cause the following info:
WARNING: CPU: 0 PID: 9202 at net/core/stream.c:205 sk_stream_kill_queues+0xc8/0xe0
Call Trace:
 <IRQ>
 inet_csk_destroy_sock+0x55/0x110
 tcp_rcv_state_process+0xe5f/0xe90
 ? sk_filter_trim_cap+0x10d/0x230
 ? tcp_v4_do_rcv+0x161/0x250
 tcp_v4_do_rcv+0x161/0x250
 tcp_v4_rcv+0xc3a/0xce0
 ip_protocol_deliver_rcu+0x3d/0x230
 ip_local_deliver_finish+0x54/0x60
 ip_local_deliver+0xfd/0x110
 ? ip_protocol_deliver_rcu+0x230/0x230
 ip_rcv+0xd6/0x100
 ? ip_local_deliver+0x110/0x110
 __netif_receive_skb_one_core+0x85/0xa0
 process_backlog+0xa4/0x160
 __napi_poll+0x29/0x1b0
 net_rx_action+0x287/0x300
 __do_softirq+0xff/0x2fc
 do_softirq+0x79/0x90
 </IRQ>

WARNING: CPU: 0 PID: 531 at net/ipv4/af_inet.c:154 inet_sock_destruct+0x175/0x1b0
Call Trace:
 <TASK>
 __sk_destruct+0x24/0x1f0
 sk_psock_destroy+0x19b/0x1c0
 process_one_work+0x1b3/0x3c0
 ? process_one_work+0x3c0/0x3c0
 worker_thread+0x30/0x350
 ? process_one_work+0x3c0/0x3c0
 kthread+0xe6/0x110
 ? kthread_complete_and_exit+0x20/0x20
 ret_from_fork+0x22/0x30
 </TASK>

Fixes: 9635720b7c ("bpf, sockmap: Fix memleak on ingress msg enqueue")
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20220304081145.2037182-2-wangyufen@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
2022-04-08 14:23:40 +02:00
..
2021-09-02 22:49:16 +02:00
2021-07-21 19:54:21 -07:00
2021-02-02 00:16:57 +01:00
2021-09-20 12:43:34 +01:00
2021-06-03 14:04:18 -07:00
2021-01-23 14:57:21 +01:00
2021-08-29 14:47:42 +03:00
2021-05-06 19:24:11 -07:00
2021-04-14 16:30:30 +03:00
2021-05-24 21:13:05 -07:00
2021-08-16 10:50:32 -06:00
2021-01-24 14:27:17 +01:00
2021-02-26 09:41:03 -08:00
2021-04-08 16:04:20 -07:00
2021-09-08 15:32:35 -07:00
2021-01-21 14:06:00 -07:00
2021-08-26 16:52:03 -07:00
2021-12-14 10:57:11 +01:00
2021-11-25 09:48:41 +01:00
2021-07-20 09:20:49 -07:00
2021-09-07 21:17:28 +02:00
2021-03-22 03:57:39 +01:00
2021-08-26 15:32:28 -04:00
2020-12-10 12:42:59 -06:00
2021-07-27 11:00:36 +02:00
2021-09-06 07:20:56 -04:00
2021-04-12 15:04:23 +02:00
2020-11-16 16:31:41 +01:00
2021-11-25 09:49:08 +01:00
2021-06-25 19:57:01 -04:00
2021-07-26 15:09:44 +02:00
2021-07-27 20:11:45 +01:00
2021-07-27 20:11:44 +01:00
2021-09-03 09:58:13 -07:00
2021-02-11 13:24:44 -08:00
2021-08-05 11:46:42 +01:00
2020-12-02 22:10:35 -08:00
2021-04-30 11:20:40 -07:00
2020-11-23 14:16:55 +00:00
2021-08-16 21:26:33 -07:00
2020-09-16 08:54:53 -05:00
2020-11-24 16:47:48 +01:00
2021-07-27 17:05:06 +01:00
2021-08-19 09:02:55 +09:00
2021-07-27 09:29:15 +02:00
2021-01-21 16:16:10 +00:00
2021-06-01 10:29:21 +01:00
2021-02-26 09:41:03 -08:00
2020-09-04 09:25:20 -07:00
2021-11-18 19:15:51 +01:00
2021-05-12 20:11:17 +02:00
2021-06-17 13:09:27 -04:00
2021-06-15 17:46:57 +02:00
2021-07-01 11:06:02 -07:00
2021-06-29 10:53:53 -07:00
2021-07-01 11:06:05 -07:00
2021-08-23 13:19:12 +02:00
2021-09-17 13:52:17 +01:00
2021-02-26 09:40:59 -08:00
2021-02-03 19:05:50 +01:00
2021-06-16 17:20:40 -05:00
2021-07-06 10:37:46 -05:00
2020-08-31 12:52:33 -07:00
2021-07-20 06:55:20 -07:00
2021-06-07 14:11:47 -07:00
2021-01-24 14:27:17 +01:00
2021-08-18 22:08:24 +02:00
2021-02-26 09:41:03 -08:00
2021-09-02 21:38:56 +02:00
2021-10-07 16:51:57 +02:00
2020-12-03 11:20:52 +01:00
2021-01-16 23:19:26 +01:00
2021-08-17 17:50:51 +02:00
2021-03-18 12:58:27 -04:00
2020-12-10 16:17:15 +01:00
2020-12-10 10:45:36 +01:00
2021-05-10 16:03:35 -07:00
2021-08-06 13:41:48 -07:00
2021-08-19 09:02:55 +09:00
2021-06-24 15:49:32 +02:00
2021-11-21 13:44:12 +01:00
2021-07-01 11:06:03 -07:00
2020-10-30 21:57:04 +01:00
2021-07-27 12:17:21 +02:00
2021-07-27 12:12:08 +02:00
2021-02-13 17:17:53 +01:00
2021-09-08 15:32:35 -07:00
2021-03-30 17:06:49 -07:00
2020-11-09 18:39:36 +01:00
2021-09-15 09:22:35 -06:00
2020-09-10 14:03:31 -07:00
2020-08-19 14:13:20 +02:00
2021-01-21 16:16:10 +00:00
2021-02-09 12:15:07 +01:00
2021-08-11 06:44:24 -04:00
2021-01-21 14:06:00 -07:00
2021-12-14 10:57:15 +01:00
2021-03-30 13:42:33 -04:00
2021-01-24 14:27:17 +01:00
2021-02-08 22:58:55 +01:00