2021-01-22 22:45:03

by Gix, Brian

Subject: [PATCH BlueZ] tools: Fix static analysis warnings

Usage of potentially NULL pointers
---
tools/btmgmt.c | 12 ++++++++++++
1 file changed, 12 insertions(+)

diff --git a/tools/btmgmt.c b/tools/btmgmt.c
index 383e7199e..f4eb541fa 100644
--- a/tools/btmgmt.c
+++ b/tools/btmgmt.c
@@ -4912,6 +4912,12 @@ static void cmd_advmon_add_pattern(int argc, char **argv)

cp_len = sizeof(*cp) + argc * sizeof(struct mgmt_adv_pattern);
cp = malloc0(cp_len);
+ if (!cp) {
+ error("Failed to alloc patterns.");
+ success = false;
+ goto done;
+ }
+
cp->pattern_count = argc;

for (i = 0; i < argc; i++) {
@@ -4987,6 +4993,12 @@ static void cmd_advmon_add_pattern_rssi(int argc, char **argv)

cp_len = sizeof(*cp) + argc * sizeof(struct mgmt_adv_pattern);
cp = malloc0(cp_len);
+ if (!cp) {
+ error("Failed to alloc patterns.");
+ success = false;
+ goto done;
+ }
+
cp->pattern_count = argc;
cp->rssi.high_threshold = rssi_high;
cp->rssi.low_threshold = rssi_low;
--
2.25.4

2021-01-22 23:01:45

by bluez.test.bot

Subject: RE: [BlueZ] tools: Fix static analysis warnings

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=420291

---Test result---

##############################
Test: CheckPatch - PASS

##############################
Test: CheckGitLint - PASS

##############################
Test: CheckBuild - PASS

##############################
Test: MakeCheck - PASS



---
Regards,
Linux Bluetooth

2021-01-26 23:01:49

by Gix, Brian

Subject: Re: [PATCH BlueZ] tools: Fix static analysis warnings

Applied

On Fri, 2021-01-22 at 11:42 -0800, Brian Gix wrote:
> Usage of potentially NULL pointers
> ---
> tools/btmgmt.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/tools/btmgmt.c b/tools/btmgmt.c
> index 383e7199e..f4eb541fa 100644
> --- a/tools/btmgmt.c
> +++ b/tools/btmgmt.c
> @@ -4912,6 +4912,12 @@ static void cmd_advmon_add_pattern(int argc, char **argv)
>
> cp_len = sizeof(*cp) + argc * sizeof(struct mgmt_adv_pattern);
> cp = malloc0(cp_len);
> + if (!cp) {
> + error("Failed to alloc patterns.");
> + success = false;
> + goto done;
> + }
> +
> cp->pattern_count = argc;
>
> for (i = 0; i < argc; i++) {
> @@ -4987,6 +4993,12 @@ static void cmd_advmon_add_pattern_rssi(int argc, char **argv)
>
> cp_len = sizeof(*cp) + argc * sizeof(struct mgmt_adv_pattern);
> cp = malloc0(cp_len);
> + if (!cp) {
> + error("Failed to alloc patterns.");
> + success = false;
> + goto done;
> + }
> +
> cp->pattern_count = argc;
> cp->rssi.high_threshold = rssi_high;
> cp->rssi.low_threshold = rssi_low;