Merge tag 'io_uring-6.18-20251120' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux

torvalds · torvalds · commit a07a003ce6d4 · 2025-11-21T11:09:57.000-08:00
Pull io_uring fix from Jens Axboe:
 "Just a single fix for a mixup of arguments for the skb_queue_splice()
  call, in the io_uring timestamp retrieval code"

* tag 'io_uring-6.18-20251120' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
  io_uring/cmd_net: fix wrong argument types for skb_queue_splice()
diff --git a/io_uring/cmd_net.c b/io_uring/cmd_net.c
@@ -127,7 +127,7 @@ static int io_uring_cmd_timestamp(struct socket *sock,
 
 	if (!unlikely(skb_queue_empty(&list))) {
 		scoped_guard(spinlock_irqsave, &q->lock)
-			skb_queue_splice(q, &list);
+			skb_queue_splice(&list, q);
 	}
 	return -EAGAIN;
 }

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ static int io_uring_cmd_timestamp(struct socket *sock,`
`127`	`127`
`128`	`128`	`if (!unlikely(skb_queue_empty(&list))) {`
`129`	`129`	`scoped_guard(spinlock_irqsave, &q->lock)`
`130`		`- skb_queue_splice(q, &list);`
	`130`	`+ skb_queue_splice(&list, q);`
`131`	`131`	`}`
`132`	`132`	`return -EAGAIN;`
`133`	`133`	`}`