]> Pileus Git - ~andy/linux/commitdiff
caif_virtio: Check that vringh_config is not null
authorSjur Brændeland <sjur.brandeland@stericsson.com>
Sun, 24 Mar 2013 03:49:59 +0000 (14:19 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Sun, 24 Mar 2013 03:59:15 +0000 (14:29 +1030)
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>
drivers/net/caif/caif_virtio.c

index fb80765e258e45ef68c6111db62ebc44af6de3e3..316b184ea130a65e2a67428180ea716b64e91c2f 100644 (file)
@@ -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;