pci/windows: fix limit for hardware ID
PATCH 1/1 pci/windows: fix limit for hardware ID
Hardware ID length is limited by MAX_DEVICE_ID_LEN [1]. No functional change is intended: new value is 200, and previous one has been 260. However, it's now correct and creates no bogus dependency on path limit.
[1]: https://docs.microsoft.com/en-us/windows-hardware/drivers/install/hardware-ids
--- drivers/bus/pci/windows/pci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/bus/pci/windows/pci.c +3 -2
@@ -9,6 +9,7 @@#include "private.h" #include "pci_netuio.h" +#include <cfgmgr32.h> #include <devpkey.h> #if definedRTE_TOOLCHAIN_GCC && (__MINGW64_VERSION_MAJOR <8 )
@@ -303,7 +304,7 @@ pci_scan_one(HDEVINFO dev_info, PSP_DEVINFO_DATA device_info_data) {struct rte_pci_device *dev;int ret =-1 ; -char pci_device_info[PATH_MAX ]; +char pci_device_info[MAX_DEVICE_ID_LEN ];struct rte_pci_addr addr;struct rte_pci_id pci_id;
@@ -314,7 +315,7 @@ pci_scan_one(HDEVINFO dev_info, PSP_DEVINFO_DATA device_info_data)memset (dev,0 ,sizeof (*dev)); ret =get_pci_hardware_id (dev_info, device_info_data, - pci_device_info,PATH_MAX ); + pci_device_info,sizeof (pci_device_info));if (ret !=0 ) goto end;
Signature · 1 line
2.29.2
PATCH v2 1/1 pci/windows: fix limit for hardware ID
Length of hardware IDs list is limited by REGSTR_VAL_MAX_HCID_LEN [1], which is currently 1024. With the old limit of 260, obtaining the list could fail in a rare occasion of a very long result (no examples known). This also removes a bogus dependency on the maximum path length.
[1]: https://docs.microsoft.com/en-us/windows-hardware/drivers/install/hardware-ids
---
v2: change limit and description (self-fix)
drivers/bus/pci/windows/pci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/bus/pci/windows/pci.c +3 -2
@@ -10,6 +10,7 @@#include "pci_netuio.h" #include <devpkey.h> +#include <regstr.h> #if definedRTE_TOOLCHAIN_GCC && (__MINGW64_VERSION_MAJOR <8 )#include <devpropdef.h>
@@ -303,7 +304,7 @@ pci_scan_one(HDEVINFO dev_info, PSP_DEVINFO_DATA device_info_data) {struct rte_pci_device *dev;int ret =-1 ; -char pci_device_info[PATH_MAX ]; +char pci_device_info[REGSTR_VAL_MAX_HCID_LEN ];struct rte_pci_addr addr;struct rte_pci_id pci_id;
@@ -314,7 +315,7 @@ pci_scan_one(HDEVINFO dev_info, PSP_DEVINFO_DATA device_info_data)memset (dev,0 ,sizeof (*dev)); ret =get_pci_hardware_id (dev_info, device_info_data, - pci_device_info,PATH_MAX ); + pci_device_info,sizeof (pci_device_info));if (ret !=0 ) goto end;
Signature · 1 line
2.29.2
Thomas Monjalon
Applied11/12/2020 21:09, Dmitry Kozlyuk:
Quoted 5 lines
Length of hardware IDs list is limited by
REGSTR_VAL_MAX_HCID_LEN[1], which is currently 1024. With the old limit of 260, obtaining the list could fail in a rare occasion of a very long result (no examples known). This also removes a bogus dependency on the maximum path length.
Quoted 7 lines
[1]: https://docs.microsoft.com/en-us/windows-hardware/drivers/install/hardware-ids
Fixes b762221ac24f ("bus/pci: support Windows with bifurcated drivers")Cc Tal Shnaiderman <[email protected]>Signed-off-by Dmitry Kozlyuk <[email protected]>
Applied, thanks