On Fri 02 Jun 04:35 PDT 2017, Henri Roosen wrote:

> A device might not have an endpoint assigned. This patch checks if
> rpdev->ept has a value before dereferencing or using it.
> 

Applied, thanks.

> Signed-off-by: Henri Roosen <[email protected]>
> ---
>  drivers/rpmsg/virtio_rpmsg_bus.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c 
> b/drivers/rpmsg/virtio_rpmsg_bus.c
> index 5e66e081..3c582f2 100644
> --- a/drivers/rpmsg/virtio_rpmsg_bus.c
> +++ b/drivers/rpmsg/virtio_rpmsg_bus.c
> @@ -314,7 +314,7 @@ static int virtio_rpmsg_announce_create(struct 
> rpmsg_device *rpdev)
>       int err = 0;
>  
>       /* need to tell remote processor's name service about this channel ? */
> -     if (rpdev->announce &&
> +     if (rpdev->announce && rpdev->ept &&
>           virtio_has_feature(vrp->vdev, VIRTIO_RPMSG_F_NS)) {
>               struct rpmsg_ns_msg nsm;
>  
> @@ -338,7 +338,7 @@ static int virtio_rpmsg_announce_destroy(struct 
> rpmsg_device *rpdev)
>       int err = 0;
>  
>       /* tell remote processor's name service we're removing this channel */
> -     if (rpdev->announce &&
> +     if (rpdev->announce && rpdev->ept &&
>           virtio_has_feature(vrp->vdev, VIRTIO_RPMSG_F_NS)) {
>               struct rpmsg_ns_msg nsm;
>  
> -- 
> 2.1.4
> 

Reply via email to