Skip to content

Commit

Permalink
l2tp: have l2tp_ip_destroy_sock use ip_flush_pending_frames
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
James Chapman authored and David S. Miller committed Jul 31, 2024
1 parent 4ff8863 commit ed8ebee
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/l2tp/l2tp_ip.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,10 @@ static void l2tp_ip_close(struct sock *sk, long timeout)
static void l2tp_ip_destroy_sock(struct sock *sk)
{
struct l2tp_tunnel *tunnel;
struct sk_buff *skb;

while ((skb = __skb_dequeue_tail(&sk->sk_write_queue)) != NULL)
kfree_skb(skb);
lock_sock(sk);
ip_flush_pending_frames(sk);
release_sock(sk);

tunnel = l2tp_sk_to_tunnel(sk);
if (tunnel) {
Expand Down

0 comments on commit ed8ebee

Please sign in to comment.