mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-15 08:07:20 +02:00
Leah Rowe
e348ea0381
You can find information about these patches here:
https://lists.gnu.org/archive/html/grub-devel/2025-02/msg00024.html
GRUB has been on a crusade as of late, to proactively audit
and fix many security vulnerabilities. This lbmk change brings
in a comprehensive series of patches that fix bugs ranging from
possible buffer overflows, use-after frees, null derefs and so on.
These changes are critical, so a revision release *will* be issued,
for the Libreboot 20241206 release series.
This change imports the following 73 patches which
are present on the upstream GRUB repository (commit IDs
matched to upstream):
* 4dc616657 loader/i386/bsd: Use safe math to avoid underflow
* 490a6ab71 loader/i386/linux: Cast left shift to grub_uint32_t
* a8d6b0633 kern/misc: Add sanity check after grub_strtoul() call
* 8e6e87e79 kern/partition: Add sanity check after grub_strtoul() call
* 5b36a5210 normal/menu: Use safe math to avoid an integer overflow
* 9907d9c27 bus/usb/ehci: Define GRUB_EHCI_TOGGLE as grub_uint32_t
* f8795cde2 misc: Ensure consistent overflow error messages
* 66733f7c7 osdep/unix/getroot: Fix potential underflow
* d13b6e8eb script/execute: Fix potential underflow and NULL dereference
* e3c578a56 fs/sfs: Check if allocated memory is NULL
* 1c06ec900 net: Check if returned pointer for allocated memory is NULL
* dee2c14fd net: Prevent overflows when allocating memory for arrays
* 4beeff8a3 net: Use safe math macros to prevent overflows
* dd6a4c8d1 fs/zfs: Add missing NULL check after grub_strdup() call
* 13065f69d fs/zfs: Check if returned pointer for allocated memory is NULL
* 7f38e32c7 fs/zfs: Prevent overflows when allocating memory for arrays
* 88e491a0f fs/zfs: Use safe math macros to prevent overflows
* cde9f7f33 fs: Prevent overflows when assigning returned values from read_number()
* 84bc0a9a6 fs: Prevent overflows when allocating memory for arrays
* 6608163b0 fs: Use safe math macros to prevent overflows
* fbaddcca5 disk/ieee1275/ofdisk: Call grub_ieee1275_close() when grub_malloc() fails
* 33bd6b5ac disk: Check if returned pointer for allocated memory is NULL
* d8151f983 disk: Prevent overflows when allocating memory for arrays
* c407724da disk: Use safe math macros to prevent overflows
* c4bc55da2 fs: Disable many filesystems under lockdown
* 26db66050 fs/bfs: Disable under lockdown
* 5f31164ae commands/hexdump: Disable memory reading in lockdown mode
* 340e4d058 commands/memrw: Disable memory reading in lockdown mode
* 34824806a commands/minicmd: Block the dump command in lockdown mode
* c68b7d236 commands/test: Stack overflow due to unlimited recursion depth
* dad8f5029 commands/read: Fix an integer overflow when supplying more than 2^31 characters
* b970a5ed9 gettext: Integer overflow leads to heap OOB write
* 09bd6eb58 gettext: Integer overflow leads to heap OOB write or read
* 7580addfc gettext: Remove variables hooks on module unload
* 9c1619773 normal: Remove variables hooks on module unload
* 2123c5bca commands/pgp: Unregister the "check_signatures" hooks on module unload
* 0bf56bce4 commands/ls: Fix NULL dereference
* 05be856a8 commands/extcmd: Missing check for failed allocation
* 98ad84328 kern/dl: Check for the SHF_INFO_LINK flag in grub_dl_relocate_symbols()
* d72208423 kern/dl: Use correct segment in grub_dl_set_mem_attrs()
* 500e5fdd8 kern/dl: Fix for an integer overflow in grub_dl_ref()
* 2c34af908 video/readers/jpeg: Do not permit duplicate SOF0 markers in JPEG
* 0707accab net/tftp: Fix stack buffer overflow in tftp_open()
* 5eef88152 net: Fix OOB write in grub_net_search_config_file()
* aa8b4d7fa net: Remove variables hooks when interface is unregisted
* a1dd8e59d net: Unregister net_default_ip and net_default_mac variables hooks on unload
* d8a937cca script/execute: Limit the recursion depth
* 8a7103fdd kern/partition: Limit recursion in part_iterate()
* 18212f064 kern/disk: Limit recursion depth
* 67f70f70a disk/loopback: Reference tracking for the loopback
* 13febd78d disk/cryptodisk: Require authentication after TPM unlock for CLI access
* 16f196874 kern/file: Implement filesystem reference counting
* a79106872 kern/file: Ensure file->data is set
* d1d6b7ea5 fs/xfs: Ensuring failing to mount sets a grub_errno
* 6ccc77b59 fs/xfs: Fix out-of-bounds read
* 067b6d225 fs/ntfs: Implement attribute verification
* 048777bc2 fs/ntfs: Use a helper function to access attributes
* 237a71184 fs/ntfs: Track the end of the MFT attribute buffer
* aff263187 fs/ntfs: Fix out-of-bounds read
* 7e2f750f0 fs/ext2: Fix out-of-bounds read for inline extents
* edd995a26 fs/jfs: Inconsistent signed/unsigned types usage in return values
* bd999310f fs/jfs: Use full 40 bits offset and address for a data extent
* ab09fd053 fs/jfs: Fix OOB read caused by invalid dir slot index
* 66175696f fs/jfs: Fix OOB read in jfs_getent()
* 1443833a9 fs/iso9660: Fix invalid free
* 965db5970 fs/iso9660: Set a grub_errno if mount fails
* f7c070a2e fs/hfsplus: Set a grub_errno if mount fails
* 563436258 fs/f2fs: Set a grub_errno if mount fails
* 0087bc690 fs/tar: Integer overflow leads to heap OOB write
* 2c8ac08c9 fs/tar: Initialize name in grub_cpio_find_file()
* 417547c10 fs/hfs: Fix stack OOB write with grub_strcpy()
* c1a291b01 fs/ufs: Fix a heap OOB write
* ea703528a misc: Implement grub_strlcpy()
Signed-off-by: Leah Rowe <leah@libreboot.org>
122 lines
3.8 KiB
Diff
122 lines
3.8 KiB
Diff
From 7a977001a1574c884c4f711686c2de01386b9230 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Rudolph <patrick.rudolph@9elements.com>
|
|
Date: Sun, 15 Nov 2020 19:51:42 +0100
|
|
Subject: [PATCH 17/26] grub-core/bus/usb: Add function pointer for
|
|
attach/detach events
|
|
|
|
The xHCI code needs to be called for attaching or detaching a device.
|
|
Introduce two functions pointers and call it from the USB hub code.
|
|
|
|
Will be used in future commits, currently this doesn't change any functionality.
|
|
|
|
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
|
|
---
|
|
grub-core/bus/usb/ehci.c | 2 ++
|
|
grub-core/bus/usb/ohci.c | 2 ++
|
|
grub-core/bus/usb/uhci.c | 2 ++
|
|
grub-core/bus/usb/usbhub.c | 19 +++++++++++++++++++
|
|
include/grub/usb.h | 4 ++++
|
|
5 files changed, 29 insertions(+)
|
|
|
|
diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c
|
|
index 2db07c7c0..1ee056015 100644
|
|
--- a/grub-core/bus/usb/ehci.c
|
|
+++ b/grub-core/bus/usb/ehci.c
|
|
@@ -1812,6 +1812,8 @@ static struct grub_usb_controller_dev usb_controller = {
|
|
.hubports = grub_ehci_hubports,
|
|
.portstatus = grub_ehci_portstatus,
|
|
.detect_dev = grub_ehci_detect_dev,
|
|
+ .attach_dev = NULL,
|
|
+ .detach_dev = NULL,
|
|
/* estimated max. count of TDs for one bulk transfer */
|
|
.max_bulk_tds = GRUB_EHCI_N_TD * 3 / 4
|
|
};
|
|
diff --git a/grub-core/bus/usb/ohci.c b/grub-core/bus/usb/ohci.c
|
|
index 5363a61f6..7a3f3e154 100644
|
|
--- a/grub-core/bus/usb/ohci.c
|
|
+++ b/grub-core/bus/usb/ohci.c
|
|
@@ -1440,6 +1440,8 @@ static struct grub_usb_controller_dev usb_controller =
|
|
.hubports = grub_ohci_hubports,
|
|
.portstatus = grub_ohci_portstatus,
|
|
.detect_dev = grub_ohci_detect_dev,
|
|
+ .attach_dev = NULL,
|
|
+ .detach_dev = NULL,
|
|
/* estimated max. count of TDs for one bulk transfer */
|
|
.max_bulk_tds = GRUB_OHCI_TDS * 3 / 4
|
|
};
|
|
diff --git a/grub-core/bus/usb/uhci.c b/grub-core/bus/usb/uhci.c
|
|
index 0fdea4c1e..03c4605b2 100644
|
|
--- a/grub-core/bus/usb/uhci.c
|
|
+++ b/grub-core/bus/usb/uhci.c
|
|
@@ -845,6 +845,8 @@ static struct grub_usb_controller_dev usb_controller =
|
|
.hubports = grub_uhci_hubports,
|
|
.portstatus = grub_uhci_portstatus,
|
|
.detect_dev = grub_uhci_detect_dev,
|
|
+ .attach_dev = NULL,
|
|
+ .detach_dev = NULL,
|
|
/* estimated max. count of TDs for one bulk transfer */
|
|
.max_bulk_tds = N_TD * 3 / 4
|
|
};
|
|
diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
|
|
index 2ae29cba1..8e963e84b 100644
|
|
--- a/grub-core/bus/usb/usbhub.c
|
|
+++ b/grub-core/bus/usb/usbhub.c
|
|
@@ -66,6 +66,15 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller,
|
|
dev->split_hubport = split_hubport;
|
|
dev->split_hubaddr = split_hubaddr;
|
|
|
|
+ if (controller->dev->attach_dev) {
|
|
+ err = controller->dev->attach_dev (controller, dev);
|
|
+ if (err)
|
|
+ {
|
|
+ grub_free (dev);
|
|
+ return NULL;
|
|
+ }
|
|
+ }
|
|
+
|
|
err = grub_usb_device_initialize (dev);
|
|
if (err)
|
|
{
|
|
@@ -405,6 +414,8 @@ static void
|
|
detach_device (grub_usb_device_t dev)
|
|
{
|
|
unsigned i;
|
|
+ grub_usb_err_t err;
|
|
+
|
|
int k;
|
|
if (!dev)
|
|
return;
|
|
@@ -425,6 +436,14 @@ detach_device (grub_usb_device_t dev)
|
|
if (inter && inter->detach_hook)
|
|
inter->detach_hook (dev, i, k);
|
|
}
|
|
+ if (dev->controller.dev->detach_dev) {
|
|
+ err = dev->controller.dev->detach_dev (&dev->controller, dev);
|
|
+ if (err)
|
|
+ {
|
|
+ // XXX
|
|
+ }
|
|
+ }
|
|
+
|
|
grub_usb_devs[dev->addr] = 0;
|
|
}
|
|
|
|
diff --git a/include/grub/usb.h b/include/grub/usb.h
|
|
index ea6ee8c2c..4dd179db2 100644
|
|
--- a/include/grub/usb.h
|
|
+++ b/include/grub/usb.h
|
|
@@ -126,6 +126,10 @@ struct grub_usb_controller_dev
|
|
|
|
grub_usb_speed_t (*detect_dev) (grub_usb_controller_t dev, int port, int *changed);
|
|
|
|
+ grub_usb_err_t (*attach_dev) (grub_usb_controller_t ctrl, grub_usb_device_t dev);
|
|
+
|
|
+ grub_usb_err_t (*detach_dev) (grub_usb_controller_t ctrl, grub_usb_device_t dev);
|
|
+
|
|
/* Per controller flag - port reset pending, don't do another reset */
|
|
grub_uint64_t pending_reset;
|
|
|
|
--
|
|
2.39.5
|
|
|