Skip to content

Commit

Permalink
PCI: hv: Add check for hyperv_initialized in init_hv_pci_drv()
Browse files Browse the repository at this point in the history
[ Upstream commit 7d815f4 ]

Add check for hv_is_hyperv_initialized() at the top of
init_hv_pci_drv(), so if the pci-hyperv driver is force-loaded on non
Hyper-V platforms, the init_hv_pci_drv() will exit immediately, without
any side effects, like assignments to hvpci_block_ops, etc.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reported-and-tested-by: Mohammad Alqayeem <mohammad.alqyeem@nutanix.com>
Reviewed-by: Wei Liu <wei.liu@kernel.org>
Link: https://lore.kernel.org/r/1621984653-1210-1-git-send-email-haiyangz@microsoft.com
Signed-off-by: Wei Liu <wei.liu@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
haiyangz authored and gregkh committed Jul 14, 2021
1 parent 4890634 commit 71f33bc
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/pci/controller/pci-hyperv.c
Original file line number Diff line number Diff line change
Expand Up @@ -3480,6 +3480,9 @@ static void __exit exit_hv_pci_drv(void)

static int __init init_hv_pci_drv(void)
{
if (!hv_is_hyperv_initialized())
return -ENODEV;

/* Set the invalid domain number's bit, so it will not be used */
set_bit(HVPCI_DOM_INVALID, hvpci_dom_map);

Expand Down

0 comments on commit 71f33bc

Please sign in to comment.