Skip to content

Commit 5a5095a

Browse files
Mani-Sadhasivambjorn-helgaas
authored andcommitted
PCI: endpoint: pci-epf-test: Make use of cached 'epc_features' in pci_epf_test_core_init()
Instead of getting the epc_features from pci_epc_get_features() API, use the cached pci_epf_test::epc_features value to avoid the NULL check. Since the NULL check is already performed in pci_epf_test_bind(), having one more check in pci_epf_test_core_init() is redundant and it is not possible to hit the NULL pointer dereference. Also with commit a01e721 ("PCI: endpoint: Remove "core_init_notifier" flag"), 'epc_features' got dereferenced without the NULL check, leading to the following false positive Smatch warning: drivers/pci/endpoint/functions/pci-epf-test.c:784 pci_epf_test_core_init() error: we previously assumed 'epc_features' could be null (see line 747) Thus, remove the redundant NULL check and also use the epc_features:: {msix_capable/msi_capable} flags directly to avoid local variables. [kwilczynski: commit log] Fixes: 5e50ee2 ("PCI: pci-epf-test: Add support to defer core initialization") Closes: https://lore.kernel.org/linux-pci/024b5826-7180-4076-ae08-57d2584cca3f@moroto.mountain Link: https://lore.kernel.org/linux-pci/20240418-pci-epf-test-fix-v2-1-eacd54831444@linaro.org Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> Reviewed-by: Niklas Cassel <cassel@kernel.org>
1 parent 328e4df commit 5a5095a

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

drivers/pci/endpoint/functions/pci-epf-test.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -735,20 +735,12 @@ static int pci_epf_test_core_init(struct pci_epf *epf)
735735
{
736736
struct pci_epf_test *epf_test = epf_get_drvdata(epf);
737737
struct pci_epf_header *header = epf->header;
738-
const struct pci_epc_features *epc_features;
738+
const struct pci_epc_features *epc_features = epf_test->epc_features;
739739
struct pci_epc *epc = epf->epc;
740740
struct device *dev = &epf->dev;
741741
bool linkup_notifier = false;
742-
bool msix_capable = false;
743-
bool msi_capable = true;
744742
int ret;
745743

746-
epc_features = pci_epc_get_features(epc, epf->func_no, epf->vfunc_no);
747-
if (epc_features) {
748-
msix_capable = epc_features->msix_capable;
749-
msi_capable = epc_features->msi_capable;
750-
}
751-
752744
if (epf->vfunc_no <= 1) {
753745
ret = pci_epc_write_header(epc, epf->func_no, epf->vfunc_no, header);
754746
if (ret) {
@@ -761,7 +753,7 @@ static int pci_epf_test_core_init(struct pci_epf *epf)
761753
if (ret)
762754
return ret;
763755

764-
if (msi_capable) {
756+
if (epc_features->msi_capable) {
765757
ret = pci_epc_set_msi(epc, epf->func_no, epf->vfunc_no,
766758
epf->msi_interrupts);
767759
if (ret) {
@@ -770,7 +762,7 @@ static int pci_epf_test_core_init(struct pci_epf *epf)
770762
}
771763
}
772764

773-
if (msix_capable) {
765+
if (epc_features->msix_capable) {
774766
ret = pci_epc_set_msix(epc, epf->func_no, epf->vfunc_no,
775767
epf->msix_interrupts,
776768
epf_test->test_reg_bar,

0 commit comments

Comments
 (0)