summaryrefslogtreecommitdiffstats
path: root/drivers/net/caif
diff options
context:
space:
mode:
authorSjur Brændeland <sjur.brandeland@stericsson.com>2013-03-24 14:19:59 +1030
committerRusty Russell <rusty@rustcorp.com.au>2013-03-24 14:29:15 +1030
commita8c7687bf21603af6246e55cc58f98e42241bd01 (patch)
tree5dad9b5fffcf702947f6c1b83b2b4e28c8bd970e /drivers/net/caif
parentb2273be8d2df7b77165a70930064aeb9e8faebfa (diff)
downloadlinux-a8c7687bf21603af6246e55cc58f98e42241bd01.tar.bz2
caif_virtio: Check that vringh_config is not null
Check that vringh_config is not NULL before using it. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/net/caif')
-rw-r--r--drivers/net/caif/caif_virtio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c
index fb80765e258e..316b184ea130 100644
--- a/drivers/net/caif/caif_virtio.c
+++ b/drivers/net/caif/caif_virtio.c
@@ -670,6 +670,10 @@ static int cfv_probe(struct virtio_device *vdev)
spin_lock_init(&cfv->tx_lock);
/* Get the RX virtio ring. This is a "host side vring". */
+ err = -ENODEV;
+ if (!vdev->vringh_config || !vdev->vringh_config->find_vrhs)
+ goto err;
+
err = vdev->vringh_config->find_vrhs(vdev, 1, &cfv->vr_rx, &vrh_cbs);
if (err)
goto err;