mirror of
https://codeberg.org/canoeboot/cbmk.git
synced 2025-07-12 08:22:25 +01:00
1dee34148f
NOTE: gfxterm_menu module removed, because of this
change by upstream:
commit ca2a91f43bf6e1df23a07c295534f871ddf2d401
Author: Glenn Washburn <development@efficientek.com>
Date: Mon May 5 16:11:36 2025 -0500
tests: Disable gfxterm_menu and cmdline_cat tests
This brings in the following changes from upstream:
* a68a7dece loader/i386/pc/linux: Fix resource leak
* de80acf36 loader/efi/linux: Unload previous Linux kernel/initrd before updating kernel size
* 249db11d8 loader/efi/linux: Correctly terminate load_options member
* f3b339af1 loader/efi/linux: Use sizeof() instead of constant
* c2b2e0dcf loader/efi/linux: Use proper type for len variable
* de4e8e2aa loader/efi/linux: Do not pass excessive size for source string
* 8c8f96664 loader/efi/linux: Remove useless assignment
* 8ebf155af include/grub/charset.h: Update documentation
* 2f2ed28d5 Revert "lzma: Make sure we don't dereference past array"
* 2539ede82 tests/util/grub-shell: Correct netboot and file_filter test failure
* 8c2d4e64f normal/charset: Fix underflow and overflow in loop init
* ba8eadde6 dl: Provide a fake grub_dl_set_persistent() and grub_dl_is_persistent() for the emu target
* 409e72ced util/grub-protect: Correct uninit "err" variable
* 5eca564b1 gnulib: Bring back the fix for resolving unused variable issue
* ac1512b87 gnulib: Add patch to allow GRUB w/GCC-15 compile
* db506b3b8 gnulib/regexec: Fix resource leak
* bba7dd736 gnulib/regcomp: Fix resource leak
* 91cb7ff6b tests/tpm2_key_protector_test: Add tests for SHA-384 PCR bank
* 451e227e5 tpm2_key_protector: Dump the PCR bank for key unsealing
* 11caacdb2 util/grub-protect: Fix the hash algorithm of PCR digest
* ce23919ca build: Add new header files to dist to allow building from tar
* e3b15bafd build: Remove extra_deps.lst from EXTRA_DIST
* 40e261b89 lib/LzmaEnc: Validate "len" before subtracting
* 86e8f2c4b osdep/unix/hostdisk: Fix signed integer overflow
* 438f05581 disk/luks2: Add attempting to decrypt message to align with luks and geli modules
* 20e6d0c4a osdep/linux/getroot: Detect DDF container similar to IMSM
* b71bc0f8b fs/fshelp: Avoid possible NULL pointer deference
* 272ff81cb fs/ntfs: Correct possible infinite loops/hangs
* 8c95307a0 fs/ntfs: Correct possible access violations
* 06914b614 fs/ntfs: Correct attribute vs attribute list validation
* 0e1762c8a fs/ntfs: Correct regression with run list calculation
* be303f8c1 lib/envblk: Ignore empty new lines while parsing env files
* 34bd00ee2 fs/zfs: Fix another memory leak in ZFS code
* ca2a91f43 tests: Disable gfxterm_menu and cmdline_cat tests
Signed-off-by: Leah Rowe <leah@libreboot.org>
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From d300f12cb624998f3d5ab5948c3fc64d6d7baf4f Mon Sep 17 00:00:00 2001
|
|
From: Sven Anderson <sven@anderson.de>
|
|
Date: Mon, 13 Jan 2025 19:51:41 +0100
|
|
Subject: [PATCH 22/26] xhci: fix port indexing
|
|
|
|
---
|
|
grub-core/bus/usb/xhci.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/grub-core/bus/usb/xhci.c b/grub-core/bus/usb/xhci.c
|
|
index f4591ffb5..dc89b9619 100644
|
|
--- a/grub-core/bus/usb/xhci.c
|
|
+++ b/grub-core/bus/usb/xhci.c
|
|
@@ -2250,7 +2250,7 @@ grub_xhci_detect_dev (grub_usb_controller_t dev, int port, int *changed)
|
|
|
|
*changed = 0;
|
|
grub_dprintf("xhci", "%s: dev=%p USB%d_%d port %d\n", __func__, dev,
|
|
- x->psids[port-1].major, x->psids[port-1].minor, port);
|
|
+ x->psids[port].major, x->psids[port].minor, port);
|
|
|
|
/* On shutdown advertise all ports as disconnected. This will trigger
|
|
* a gracefull detatch. */
|
|
@@ -2285,13 +2285,13 @@ grub_xhci_detect_dev (grub_usb_controller_t dev, int port, int *changed)
|
|
if (!(portsc & GRUB_XHCI_PORTSC_CCS))
|
|
return GRUB_USB_SPEED_NONE;
|
|
|
|
- for (grub_uint8_t i = 0; i < 16 && x->psids[port-1].psids[i].id > 0; i++)
|
|
+ for (grub_uint8_t i = 0; i < 16 && x->psids[port].psids[i].id > 0; i++)
|
|
{
|
|
- if (x->psids[port-1].psids[i].id == speed)
|
|
+ if (x->psids[port].psids[i].id == speed)
|
|
{
|
|
grub_dprintf("xhci", "%s: grub_usb_speed = %d\n", __func__,
|
|
- x->psids[port-1].psids[i].grub_usb_speed );
|
|
- return x->psids[port-1].psids[i].grub_usb_speed;
|
|
+ x->psids[port].psids[i].grub_usb_speed );
|
|
+ return x->psids[port].psids[i].grub_usb_speed;
|
|
}
|
|
}
|
|
|
|
--
|
|
2.39.5
|
|
|