Commit a4c3a07e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-xsa-6.1-rc9b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fix from Juergen Gross:
 "A single fix for the recent security issue XSA-423"

* tag 'for-linus-xsa-6.1-rc9b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/netback: fix build warning
parents 306ba240 7dfa764e

drivers/net/xen-netback/netback.c

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static int xenvif_tx_check_gop(struct xenvif_queue *queue, 
	const bool sharedslot = nr_frags &&

				frag_get_pending_idx(&shinfo->frags[0]) ==

				    copy_pending_idx(skb, copy_count(skb) - 1);

	int i, err;

	int i, err = 0;



	for (i = 0; i < copy_count(skb); i++) {

		int newerr;