From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail-lf0-f68.google.com ([209.85.215.68]:33692 "EHLO
        mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750765AbdAWP2M (ORCPT
        <rfc822;stable@vger.kernel.org>); Mon, 23 Jan 2017 10:28:12 -0500
Received: by mail-lf0-f68.google.com with SMTP id x1so14402895lff.0
        for <stable@vger.kernel.org>; Mon, 23 Jan 2017 07:28:11 -0800 (PST)
Date: Mon, 23 Jan 2017 16:28:08 +0100
From: Johan Hovold <johan@kernel.org>
To: Rui Miguel Silva <rmfrfs@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Bryan O'Donoghue <pure.logic@nexus-software.ie>,
        Johan Hovold <johan@kernel.org>, Alex Elder <elder@linaro.org>,
        devel@driverdev.osuosl.org, greybus-dev@lists.linaro.org,
        "# 4 . 9 . x" <stable@vger.kernel.org>
Subject: Re: [PATCH] staging: greybus: timesync: validate platform state
 callback
Message-ID: <20170123152808.GE3389@localhost>
References: <20170123142244.7468-1-rmfrfs@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170123142244.7468-1-rmfrfs@gmail.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Mon, Jan 23, 2017 at 02:22:44PM +0000, Rui Miguel Silva wrote:
> When tearingdown timesync, and not in arche platform, the state platform
> callback is not initialized. That will trigger the following NULL
> dereferencing.
> CallTrace:
> 
>  ? gb_timesync_platform_unlock_bus+0x11/0x20 [greybus]
>  gb_timesync_teardown+0x85/0xc0 [greybus]
>  gb_timesync_svc_remove+0xab/0x190 [greybus]
>  gb_svc_del+0x29/0x110 [greybus]
>  gb_hd_del+0x14/0x20 [greybus]
>  ap_disconnect+0x24/0x60 [gb_es2]
>  usb_unbind_interface+0x7a/0x2c0
>  __device_release_driver+0x96/0x150
>  device_release_driver+0x1e/0x30
>  bus_remove_device+0xe7/0x130
>  device_del+0x116/0x230
>  usb_disable_device+0x97/0x1f0
>  usb_disconnect+0x80/0x260
>  hub_event+0x5ca/0x10e0
>  process_one_work+0x126/0x3b0
>  worker_thread+0x55/0x4c0
>  ? process_one_work+0x3b0/0x3b0
>  kthread+0xc4/0xe0
>  ? kthread_park+0xb0/0xb0
>  ret_from_fork+0x22/0x30
> 
> So, fix that by adding checks before use the callback.
> 
> Cc: <stable@vger.kernel.org> # 4.9.x
> Signed-off-by: Rui Miguel Silva <rmfrfs@gmail.com>
> ---
> Greg,
> This patch does not contain the "commit <sha> upstream" snippet since you
> already removed the timesync code from the -next tree. So, It would never get
> there. However this will affect the greybus users of 4.9.x.

This code is still in Linus tree and 4.10-rc so this is just a normal
fix even if this is no longer an issue in -next.

>  drivers/staging/greybus/timesync_platform.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/greybus/timesync_platform.c b/drivers/staging/greybus/timesync_platform.c
> index 113f3d6c4b3a..7d3ccc2bc98c 100644
> --- a/drivers/staging/greybus/timesync_platform.c
> +++ b/drivers/staging/greybus/timesync_platform.c
> @@ -45,13 +45,18 @@ u32 gb_timesync_platform_get_clock_rate(void)
>  
>  int gb_timesync_platform_lock_bus(struct gb_timesync_svc *pdata)
>  {
> +	if (!arche_platform_change_state_cb)
> +		return 0;
> +
>  	return arche_platform_change_state_cb(ARCHE_PLATFORM_STATE_TIME_SYNC,
>  					      pdata);
>  }
>  
>  void gb_timesync_platform_unlock_bus(void)
>  {
> -	arche_platform_change_state_cb(ARCHE_PLATFORM_STATE_ACTIVE, NULL);
> +	if (arche_platform_change_state_cb)
> +		arche_platform_change_state_cb(ARCHE_PLATFORM_STATE_ACTIVE,
> +					       NULL);

I'd use the same pattern here:

	if (!arche_platform_change_state_cb)
		return;

	arche_platform_change_state_cb(ARCHE_PLATFORM_STATE_ACTIVE, NULL);

Thanks,
Johan