mirror of
https://github.com/ipxe/ipxe
synced 2025-12-23 21:41:43 +03:00
[pci] Check for wraparound in callers of pci_find_next()
The semantics of the bus:dev.fn parameter passed to pci_find_next() are "find the first existent PCI device at this address or higher", with the caller expected to increment the address between finding devices. This does not allow the parameter to distinguish between the two cases "start from address zero" and "wrapped after incrementing maximal possible address", which could therefore lead to an infinite loop in the degenerate case that a device with address ffff:ff:1f.7 really exists. Fix by checking for wraparound in the caller (which is already responsible for performing the increment). Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <getopt.h>
|
||||
#include <ipxe/pci.h>
|
||||
#include <ipxe/command.h>
|
||||
@@ -79,6 +80,10 @@ static int pciscan_exec ( int argc, char **argv ) {
|
||||
} else {
|
||||
/* Setting is defined: start searching from next location */
|
||||
busdevfn = ( prev + 1 );
|
||||
if ( ! busdevfn ) {
|
||||
rc = -ENOENT;
|
||||
goto err_end;
|
||||
}
|
||||
}
|
||||
|
||||
/* Find next existent PCI device */
|
||||
@@ -101,6 +106,7 @@ static int pciscan_exec ( int argc, char **argv ) {
|
||||
}
|
||||
|
||||
err_store:
|
||||
err_end:
|
||||
err_find_next:
|
||||
err_parse_setting:
|
||||
err_parse_options:
|
||||
|
||||
Reference in New Issue
Block a user