From: Chan-yeol Park <chanyeol.park@samsung.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v2 2/2] Bluetooth: hci_uart: Fix dereferencing of ERR_PTR
Date: Wed, 17 Jun 2015 13:59:09 +0900 [thread overview]
Message-ID: <1434517149-1728-2-git-send-email-chanyeol.park@samsung.com> (raw)
In-Reply-To: <1434517149-1728-1-git-send-email-chanyeol.park@samsung.com>
If h4_recv_buff() return ERR_PTR, h4->rx_skb should not be dereferenced.
Signed-off-by: Chan-yeol Park <chanyeol.park@samsung.com>
---
drivers/bluetooth/hci_h4.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index f7190f0..54116464 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -92,7 +92,8 @@ static int h4_close(struct hci_uart *hu)
skb_queue_purge(&h4->txq);
- kfree_skb(h4->rx_skb);
+ if (!IS_ERR(h4->rx_skb))
+ kfree_skb(h4->rx_skb);
hu->priv = NULL;
kfree(h4);
@@ -173,7 +174,7 @@ struct sk_buff *h4_recv_buf(struct hci_dev *hdev, struct sk_buff *skb,
while (count) {
int i, len;
- if (!skb) {
+ if (IS_ERR_OR_NULL(skb)) {
for (i = 0; i < pkts_count; i++) {
if (buffer[0] != (&pkts[i])->type)
continue;
--
2.1.4
prev parent reply other threads:[~2015-06-17 4:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 4:59 [PATCH v2 1/2] Bluetooth: hci_uart: Include vendor struct if required Chan-yeol Park
2015-06-17 4:59 ` Chan-yeol Park [this message]
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=1434517149-1728-2-git-send-email-chanyeol.park@samsung.com \
--to=chanyeol.park@samsung.com \
--cc=linux-bluetooth@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.