From: Niklas Cassel <niklas.cassel@axis.com>
To: Kishon Vijay Abraham I <kishon@ti.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: Niklas Cassel <niklass@axis.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 2/3] PCI: endpoint: Fix error handling in pci_epc_epf_link()
Date: Tue, 12 Dec 2017 15:16:33 +0100 [thread overview]
Message-ID: <20171212141634.5985-3-niklas.cassel@axis.com> (raw)
In-Reply-To: <20171212141634.5985-1-niklas.cassel@axis.com>
The error handling in pci_epc_epf_link() is broken,
since the clean up code for pci_epc_add_epf() calls clear_bit(),
even though the matching set_bit() is done after pci_epc_add_epf().
Also, clear_bit() should be done before pci_epc_remove_epf(),
since clean up code should normally do things in the reverse order.
Fixes: d74679911610 ("PCI: endpoint: Introduce configfs entry for configuring EP functions")
Signed-off-by: Niklas Cassel <niklas.cassel@axis.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
---
drivers/pci/endpoint/pci-ep-cfs.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/endpoint/pci-ep-cfs.c b/drivers/pci/endpoint/pci-ep-cfs.c
index 4f74386c1ced..e1f5adc9e113 100644
--- a/drivers/pci/endpoint/pci-ep-cfs.c
+++ b/drivers/pci/endpoint/pci-ep-cfs.c
@@ -106,7 +106,7 @@ static int pci_epc_epf_link(struct config_item *epc_item,
epf = epf_group->epf;
ret = pci_epc_add_epf(epc, epf);
if (ret)
- goto err_add_epf;
+ return ret;
func_no = find_first_zero_bit(&epc_group->function_num_map,
sizeof(epc_group->function_num_map));
@@ -120,10 +120,8 @@ static int pci_epc_epf_link(struct config_item *epc_item,
return 0;
err_epf_bind:
- pci_epc_remove_epf(epc, epf);
-
-err_add_epf:
clear_bit(func_no, &epc_group->function_num_map);
+ pci_epc_remove_epf(epc, epf);
return ret;
}
--
2.14.2
next prev parent reply other threads:[~2017-12-12 14:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-12 14:16 [PATCH v4 0/3] Fix find_first_zero_bit() usage Niklas Cassel
2017-12-12 14:16 ` [PATCH v4 1/3] PCI: designware-ep: " Niklas Cassel
2017-12-14 11:03 ` Kishon Vijay Abraham I
2017-12-12 14:16 ` Niklas Cassel [this message]
2017-12-14 11:07 ` [PATCH v4 2/3] PCI: endpoint: Fix error handling in pci_epc_epf_link() Kishon Vijay Abraham I
2017-12-14 12:07 ` Lorenzo Pieralisi
2017-12-14 12:13 ` Kishon Vijay Abraham I
2017-12-12 14:16 ` [PATCH v4 3/3] PCI: endpoint: Fix find_first_zero_bit() usage Niklas Cassel
2017-12-14 11:09 ` Kishon Vijay Abraham I
2017-12-12 14:33 ` [PATCH v4 0/3] " David Laight
2017-12-12 15:24 ` Lorenzo Pieralisi
2017-12-12 15:39 ` David Laight
2017-12-13 21:59 ` Bjorn Helgaas
2017-12-14 13:32 ` Niklas Cassel
2017-12-14 13:47 ` Lorenzo Pieralisi
2017-12-14 23:21 ` Bjorn Helgaas
2017-12-15 9:42 ` Lorenzo Pieralisi
2017-12-14 10:51 ` Lorenzo Pieralisi
2017-12-14 11:25 ` Kishon Vijay Abraham I
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171212141634.5985-3-niklas.cassel@axis.com \
--to=niklas.cassel@axis.com \
--cc=bhelgaas@google.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=niklass@axis.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).