Return-Path: <cyrus@holtmann.org>
From: Szymon Janc <szymon.janc@tieto.com>
To: Atul Rai <a.rai@samsung.com>
Cc: linux-bluetooth@vger.kernel.org, sachin.dev@samsung.com
Subject: Re: [PATCH] android/hal-bluetooth: Fix NULL ptr dereference
Date: Mon, 27 Jul 2015 21:21:59 +0200
Message-ID: <1916606.IEpI44LjIf@leonov>
In-Reply-To: <1435560253-5511-1-git-send-email-a.rai@samsung.com>
References: <1435560253-5511-1-git-send-email-a.rai@samsung.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Sender: linux-bluetooth-owner@vger.kernel.org
List-ID: <linux-bluetooth.vger.kernel.org>

Hi Atul,

On Monday 29 of June 2015 12:14:13 Atul Rai wrote:
> Add NULL check on malloc return to fix NULL pointer dereference
> in case malloc fails.
> ---
>  android/hal-bluetooth.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
> index e24f7d2..66f4a37 100644
> --- a/android/hal-bluetooth.c
> +++ b/android/hal-bluetooth.c
> @@ -19,6 +19,7 @@
>  #include <stdlib.h>
>  #include <stdbool.h>
>  #include <string.h>
> +#include <errno.h>
> 
>  #include <cutils/properties.h>
> 
> @@ -1103,6 +1104,11 @@ static int open_bluetooth(const struct hw_module_t
> *module, char const *name,
> 
>  	DBG("");
> 
> +	if (!dev) {
> +		error("Failed to allocate memory for device");
> +		return -ENOMEM;
> +	}
> +
>  	memset(dev, 0, sizeof(bluetooth_device_t));
>  	dev->common.tag = HARDWARE_DEVICE_TAG;
>  	dev->common.version = 0;

Patch applied, thanks.

-- 
BR
Szymon Janc