From: Tedd Ho-Jeong An <hj.tedd.an@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: tedd.an@intel.com
Subject: [PATCH 2/6] monitor: Fix the unchecked return value
Date: Fri, 20 Nov 2020 12:07:08 -0800 [thread overview]
Message-ID: <20201120200712.491219-2-tedd.an@intel.com> (raw)
In-Reply-To: <20201120200712.491219-1-tedd.an@intel.com>
This patch fixes the unchecked return value.
---
monitor/a2dp.c | 30 ++++++++++++++++++++----------
monitor/l2cap.c | 3 +++
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/monitor/a2dp.c b/monitor/a2dp.c
index ac2e1a228..f6e99ab26 100644
--- a/monitor/a2dp.c
+++ b/monitor/a2dp.c
@@ -364,7 +364,8 @@ static bool codec_mpeg12_cap(uint8_t losc, struct l2cap_frame *frame)
if (losc != 4)
return false;
- l2cap_frame_get_be16(frame, &cap);
+ if (!l2cap_frame_get_be16(frame, &cap))
+ return false;
layer = (cap >> 8) & 0xe0;
crc = cap & 0x1000;
@@ -372,7 +373,8 @@ static bool codec_mpeg12_cap(uint8_t losc, struct l2cap_frame *frame)
mpf = cap & 0x0040;
freq = cap & 0x003f;
- l2cap_frame_get_be16(frame, &cap);
+ if (!l2cap_frame_get_be16(frame, &cap))
+ return false;
vbr = cap & 0x8000;
bitrate = cap & 0x7fff;
@@ -414,7 +416,8 @@ static bool codec_mpeg12_cfg(uint8_t losc, struct l2cap_frame *frame)
if (losc != 4)
return false;
- l2cap_frame_get_be16(frame, &cap);
+ if (!l2cap_frame_get_be16(frame, &cap))
+ return false;
layer = (cap >> 8) & 0xe0;
crc = cap & 0x1000;
@@ -422,7 +425,8 @@ static bool codec_mpeg12_cfg(uint8_t losc, struct l2cap_frame *frame)
mpf = cap & 0x0040;
freq = cap & 0x003f;
- l2cap_frame_get_be16(frame, &cap);
+ if (!l2cap_frame_get_be16(frame, &cap))
+ return false;
vbr = cap & 0x8000;
bitrate = cap & 0x7fff;
@@ -466,19 +470,22 @@ static bool codec_aac_cap(uint8_t losc, struct l2cap_frame *frame)
if (losc != 6)
return false;
- l2cap_frame_get_be16(frame, &cap);
+ if (!l2cap_frame_get_be16(frame, &cap))
+ return false;
type = cap >> 8;
freq = cap << 8;
- l2cap_frame_get_be16(frame, &cap);
+ if (!l2cap_frame_get_be16(frame, &cap))
+ return false;
freq |= (cap >> 8) & 0xf0;
chan = (cap >> 8) & 0x0c;
bitrate = (cap << 16) & 0x7f0000;
vbr = cap & 0x0080;
- l2cap_frame_get_be16(frame, &cap);
+ if (!l2cap_frame_get_be16(frame, &cap))
+ return false;
bitrate |= cap;
@@ -509,19 +516,22 @@ static bool codec_aac_cfg(uint8_t losc, struct l2cap_frame *frame)
if (losc != 6)
return false;
- l2cap_frame_get_be16(frame, &cap);
+ if (!l2cap_frame_get_be16(frame, &cap))
+ return false;
type = cap >> 8;
freq = cap << 8;
- l2cap_frame_get_be16(frame, &cap);
+ if (!l2cap_frame_get_be16(frame, &cap))
+ return false;
freq |= (cap >> 8) & 0xf0;
chan = (cap >> 8) & 0x0c;
bitrate = (cap << 16) & 0x7f0000;
vbr = cap & 0x0080;
- l2cap_frame_get_be16(frame, &cap);
+ if (!l2cap_frame_get_be16(frame, &cap))
+ return false;
bitrate |= cap;
diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index ca1997a0c..f16f82532 100644
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -3243,6 +3243,9 @@ void l2cap_frame(uint16_t index, bool in, uint16_t handle, uint16_t cid,
case L2CAP_MODE_LE_FLOWCTL:
case L2CAP_MODE_ECRED:
chan = get_chan(&frame);
+ if (!chan)
+ return;
+
if (!chan->sdu) {
if (!l2cap_frame_get_le16(&frame, &chan->sdu))
return;
--
2.25.4
next prev parent reply other threads:[~2020-11-20 20:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 20:07 [PATCH 1/6] monitor: Fix potential memory leak Tedd Ho-Jeong An
2020-11-20 20:07 ` Tedd Ho-Jeong An [this message]
2020-11-20 20:07 ` [PATCH 3/6] btio: Fix the unchecked return value Tedd Ho-Jeong An
2020-11-20 20:07 ` [PATCH 4/6] emulator: " Tedd Ho-Jeong An
2020-11-20 20:07 ` [PATCH 5/6] profile/bnep: " Tedd Ho-Jeong An
2020-11-20 20:07 ` [PATCH 6/6] lib: " Tedd Ho-Jeong An
2020-11-20 20:27 ` [1/6] monitor: Fix potential memory leak bluez.test.bot
2020-11-24 21:22 ` Luiz Augusto von Dentz
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=20201120200712.491219-2-tedd.an@intel.com \
--to=hj.tedd.an@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=tedd.an@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;
as well as URLs for NNTP newsgroup(s).