All of lore.kernel.org
 help / color / mirror / Atom feed
From: johan.hedberg@gmail.com
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 1/6] Bluetooth: Fix missing NULL check for smp_chan_create() return value
Date: Mon, 16 Jun 2014 11:00:28 +0300	[thread overview]
Message-ID: <1402905633-470-2-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1402905633-470-1-git-send-email-johan.hedberg@gmail.com>

From: Johan Hedberg <johan.hedberg@intel.com>

The smp_chan_create function may return NULL, e.g. in the case of memory
allocation failure, so we always need to check for this.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
 net/bluetooth/smp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index f2829a7932e2..e779e5298ebf 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -856,6 +856,8 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)
 		return 0;
 
 	smp = smp_chan_create(conn);
+	if (!smp)
+		return SMP_UNSPECIFIED;
 
 	skb_pull(skb, sizeof(*rp));
 
-- 
1.9.3


  reply	other threads:[~2014-06-16  8:00 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-16  8:00 [PATCH 0/6] Bluetooth: Various SMP cleanups & fixes johan.hedberg
2014-06-16  8:00 ` johan.hedberg [this message]
2014-06-16  8:00 ` [PATCH 2/6] Bluetooth: Remove unnecessary SMP STK define johan.hedberg
2014-06-16 12:48   ` [PATCH v2 " johan.hedberg
2014-06-16  8:00 ` [PATCH 3/6] Bluetooth: Remove HCI prefix from SMP LTK defines johan.hedberg
2014-06-16  8:00 ` [PATCH 4/6] Bluetooth: Remove unused LTK authentication defines johan.hedberg
2014-06-16  8:00 ` [PATCH 5/6] Bluetooth: Convert SMP flags into an enum johan.hedberg
2014-06-16  8:00 ` [PATCH 6/6] Bluetooth: Add flexible buffer byte order swapping function johan.hedberg
2014-06-16 16:33 ` [PATCH 0/6] Bluetooth: Various SMP cleanups & fixes Marcel Holtmann

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=1402905633-470-2-git-send-email-johan.hedberg@gmail.com \
    --to=johan.hedberg@gmail.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.