Skip to content

Commit b9f22de

Browse files
committed
Merge: Draft: Merge tag 'kernel-5.14.0-503.1.1.el9_5' from 9.5
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5139 kernel-5.14.0-503.1.1.el9_5 Conflicts dropped: - Makefile.rhelver Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2 parents 080ae15 + 6723217 commit b9f22de

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

drivers/usb/host/xhci-ring.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2660,16 +2660,17 @@ static int handle_tx_event(struct xhci_hcd *xhci,
26602660
else
26612661
xhci_handle_halted_endpoint(xhci, ep, NULL,
26622662
EP_SOFT_RESET);
2663-
goto cleanup;
2663+
break;
26642664
case COMP_RING_UNDERRUN:
26652665
case COMP_RING_OVERRUN:
26662666
case COMP_STOPPED_LENGTH_INVALID:
2667-
goto cleanup;
2667+
break;
26682668
default:
26692669
xhci_err(xhci, "ERROR Transfer event for unknown stream ring slot %u ep %u\n",
26702670
slot_id, ep_index);
26712671
goto err_out;
26722672
}
2673+
return 0;
26732674
}
26742675

26752676
/* Count current td numbers if ep->skip is set */

redhat/kernel.changelog-9.5

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
* Tue Sep 03 2024 Lucas Zampieri <lzampier@redhat.com> [5.14.0-503.1.1.el9_5]
2+
- usb: xhci: prevent potential failure in handle_tx_event() for Transfer events without TRB (Desnes Nunes) [RHEL-52378] {CVE-2024-42226}
3+
- redhat: set defaults for RHEL 9.5 (Lucas Zampieri)
4+
Resolves: RHEL-52378
5+
16
* Thu Aug 22 2024 Lucas Zampieri <lzampier@redhat.com> [5.14.0-503.el9]
27
- Revert "Merge: scsi: fnic: driver update" (John Meneghini) [RHEL-36420]
38
- dev/parport: fix the array out-of-bounds risk (CKI Backport Bot) [RHEL-54990] {CVE-2024-42301}

0 commit comments

Comments
 (0)