nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

l2tp: have l2tp_ip_destroy_sock use ip_flush_pending_frames

Browse source 
Use the recently exported ip_flush_pending_frames instead of a
free-coded version and lock the socket while we call it.

Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
James Chapman 2024-07-29 16:38:02 +01:00 committed by David S. Miller
parent 4ff8863419
commit ed8ebee6de
1 changed files with 3 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
net/l2tp/l2tp_ip.c
View file

@ -236,10 +236,10 @@ static void l2tp_ip_close(struct sock *sk, long timeout)
static void l2tp_ip_destroy_sock(struct sock *sk) static void l2tp_ip_destroy_sock(struct sock *sk)
{ {
struct l2tp_tunnel *tunnel; struct l2tp_tunnel *tunnel;
struct sk_buff *skb;
while ((skb = __skb_dequeue_tail(&sk->sk_write_queue)) != NULL) lock_sock(sk);
kfree_skb(skb); ip_flush_pending_frames(sk);
release_sock(sk);
tunnel = l2tp_sk_to_tunnel(sk); tunnel = l2tp_sk_to_tunnel(sk);
if (tunnel) { if (tunnel) {