Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200916223453.22537-1-sonnysasaka@chromium.org>
In-Reply-To: <20200916223453.22537-1-sonnysasaka@chromium.org>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Thu, 17 Sep 2020 10:05:39 -0700
Message-ID: <CABBYNZ+Vjs0R+Vxhk0V4rbf_kQ7sFdDZtaM0+pjtfN4hz-maxA@mail.gmail.com>
Subject: Re: [PATCH BlueZ v2] sixaxis: Fix crash caused by return of udev_device_get_property_value
To:     Sonny Sasaka <sonnysasaka@chromium.org>
Cc:     "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>,
        Miao-chen Chou <mcchou@chromium.org>,
        Yoni Shavit <yshavit@chromium.org>,
        Alain Michaud <alainm@chromium.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Hi Sonny,

On Wed, Sep 16, 2020 at 3:37 PM Sonny Sasaka <sonnysasaka@chromium.org> wrote:
>
> From: Miao-chen Chou <mcchou@chromium.org>
>
> This adds a NULL check before calling sscanf().
>
> Reviewed-by: Yoni Shavit <yshavit@chromium.org>
> Reviewed-by: Alain Michaud <alainm@chromium.org>
>
> ---
>  plugins/sixaxis.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
> index 939fed759..996f85dd6 100644
> --- a/plugins/sixaxis.c
> +++ b/plugins/sixaxis.c
> @@ -411,7 +411,7 @@ get_pairing_type_for_device(struct udev_device *udevice, uint16_t *bus,
>
>         hid_id = udev_device_get_property_value(hid_parent, "HID_ID");
>
> -       if (sscanf(hid_id, "%hx:%hx:%hx", bus, &vid, &pid) != 3)
> +       if (!hid_id || sscanf(hid_id, "%hx:%hx:%hx", bus, &vid, &pid) != 3)
>                 return NULL;
>
>         cp = get_pairing(vid, pid);
> --
> 2.26.2

Applied, thanks.

-- 
Luiz Augusto von Dentz