From: Henri Roosen Date: Fri, 2 Jun 2017 11:35:51 +0000 (+0200) Subject: rpmsg: virtio_rpmsg_bus: fix announce for devices without endpoint X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b2599ebffb2d32e051669c0a94f8e363ad7a2e8b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git rpmsg: virtio_rpmsg_bus: fix announce for devices without endpoint A device might not have an endpoint assigned. This patch checks if rpdev->ept has a value before dereferencing or using it. Signed-off-by: Henri Roosen Signed-off-by: Bjorn Andersson --- diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 4848da89431f..6ec73c6ab4b1 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;