From: Michael Thalmeier <michael.thalmeier@hale.at>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: Lauro Ramos Venancio <lauro.venancio@openbossa.org>,
Aloisio Almeida Jr <aloisio.almeida@openbossa.org>,
linux-kernel@vger.kernel.org, linux-nfc@ml01.01.org,
michael@thalmeier.at
Subject: [PATCH 07/11] NFC: pn533: improve cmd queue handling
Date: Thu, 21 Apr 2016 16:43:55 +0200 [thread overview]
Message-ID: <1461249839-16962-8-git-send-email-michael.thalmeier@hale.at> (raw)
In-Reply-To: <1461249839-16962-1-git-send-email-michael.thalmeier@hale.at>
Make sure cmd is set before a frame is passed to the transport layer for
sending. In addition pn533_send_async_complete checks if cmd is set before
accessing its members.
Signed-off-by: Michael Thalmeier <michael.thalmeier@hale.at>
---
drivers/nfc/pn533/pn533.c | 54 +++++++++++++++++++++++++++++------------------
1 file changed, 34 insertions(+), 20 deletions(-)
diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c
index d9c5583..d1cc70a 100644
--- a/drivers/nfc/pn533/pn533.c
+++ b/drivers/nfc/pn533/pn533.c
@@ -383,26 +383,36 @@ static void pn533_build_cmd_frame(struct pn533 *dev, u8 cmd_code,
static int pn533_send_async_complete(struct pn533 *dev)
{
struct pn533_cmd *cmd = dev->cmd;
- int status = cmd->status;
+ int rc = 0;
- struct sk_buff *req = cmd->req;
- struct sk_buff *resp = cmd->resp;
+ if (cmd) {
+ int status = cmd->status;
- int rc;
+ struct sk_buff *req = cmd->req;
+ struct sk_buff *resp = cmd->resp;
- dev_kfree_skb(req);
+ dev_kfree_skb(req);
- if (status < 0) {
- rc = cmd->complete_cb(dev, cmd->complete_cb_context,
- ERR_PTR(status));
- dev_kfree_skb(resp);
- goto done;
- }
+ if (status < 0) {
+ rc = cmd->complete_cb(dev, cmd->complete_cb_context,
+ ERR_PTR(status));
+ dev_kfree_skb(resp);
+ goto done;
+ }
+
+ /* when no response is set we got interrupted */
+ if (!resp)
+ resp = ERR_PTR(-EINTR);
- skb_pull(resp, dev->ops->rx_header_len);
- skb_trim(resp, resp->len - dev->ops->rx_tail_len);
+ if (!IS_ERR(resp)) {
+ skb_pull(resp, dev->ops->rx_header_len);
+ skb_trim(resp, resp->len - dev->ops->rx_tail_len);
+ }
- rc = cmd->complete_cb(dev, cmd->complete_cb_context, resp);
+ rc = cmd->complete_cb(dev, cmd->complete_cb_context, resp);
+ } else {
+ dev_dbg(dev->dev, "%s: cmd not set\n", __func__);
+ }
done:
kfree(cmd);
@@ -434,12 +444,14 @@ static int __pn533_send_async(struct pn533 *dev, u8 cmd_code,
mutex_lock(&dev->cmd_lock);
if (!dev->cmd_pending) {
+ dev->cmd = cmd;
rc = dev->phy_ops->send_frame(dev, req);
- if (rc)
+ if (rc) {
+ dev->cmd = NULL;
goto error;
+ }
dev->cmd_pending = 1;
- dev->cmd = cmd;
goto unlock;
}
@@ -511,11 +523,12 @@ static int pn533_send_cmd_direct_async(struct pn533 *dev, u8 cmd_code,
pn533_build_cmd_frame(dev, cmd_code, req);
+ dev->cmd = cmd;
rc = dev->phy_ops->send_frame(dev, req);
- if (rc < 0)
+ if (rc < 0) {
+ dev->cmd = NULL;
kfree(cmd);
- else
- dev->cmd = cmd;
+ }
return rc;
}
@@ -550,14 +563,15 @@ static void pn533_wq_cmd(struct work_struct *work)
mutex_unlock(&dev->cmd_lock);
+ dev->cmd = cmd;
rc = dev->phy_ops->send_frame(dev, cmd->req);
if (rc < 0) {
+ dev->cmd = NULL;
dev_kfree_skb(cmd->req);
kfree(cmd);
return;
}
- dev->cmd = cmd;
}
struct pn533_sync_cmd_response {
--
2.5.5
next prev parent reply other threads:[~2016-04-21 14:46 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-21 14:43 [PATCH 00/11] NFC: pn533: bug fixes and improvements Michael Thalmeier
2016-04-21 14:43 ` [PATCH 01/11] NFC: pn533: i2c: free irq on driver remove Michael Thalmeier
2016-04-21 14:43 ` [PATCH 02/11] NFC: pn533: fix order of initialization Michael Thalmeier
2016-04-21 14:43 ` [PATCH 03/11] NFC: pn533: i2c: do not call pn533_recv_frame with aborted commands Michael Thalmeier
2016-04-21 14:43 ` [PATCH 04/11] NFC: pn533: reset poll modulation list before calling nfc_targets_found Michael Thalmeier
2016-04-21 14:43 ` [PATCH 05/11] NFC: pn533: handle interrupted commands in pn533_recv_frame Michael Thalmeier
2016-04-21 14:43 ` [PATCH 06/11] NFC: pn533: usb: fix errors when poll is stopped Michael Thalmeier
2016-05-01 23:17 ` Samuel Ortiz
2016-04-21 14:43 ` Michael Thalmeier [this message]
2016-05-01 23:17 ` [PATCH 07/11] NFC: pn533: improve cmd queue handling Samuel Ortiz
2016-04-21 14:43 ` [PATCH 08/11] NFC: pn533: reduce output when stopping poll Michael Thalmeier
2016-05-01 23:18 ` Samuel Ortiz
2016-04-21 14:43 ` [PATCH 09/11] NFC: pn533: use nfc_alloc_recv_skb for skb allocation Michael Thalmeier
2016-05-01 23:17 ` Samuel Ortiz
2016-04-21 14:43 ` [PATCH 10/11] NFC: pn533: set cmd status when not set Michael Thalmeier
2016-04-21 14:43 ` [PATCH 11/11] nfc: pn533: increase clock frequency for PN532 Michael Thalmeier
2016-04-28 18:18 ` [PATCH 00/11] NFC: pn533: bug fixes and improvements Olliver Schinagl
2016-05-04 15:18 ` Olliver Schinagl
2016-05-09 11:59 ` Olliver Schinagl
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=1461249839-16962-8-git-send-email-michael.thalmeier@hale.at \
--to=michael.thalmeier@hale.at \
--cc=aloisio.almeida@openbossa.org \
--cc=lauro.venancio@openbossa.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfc@ml01.01.org \
--cc=michael@thalmeier.at \
--cc=sameo@linux.intel.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
all inboxes | Powered by JetHome®