Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1BD8CC433EF for ; Tue, 29 Mar 2022 17:03:12 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8612784091; Tue, 29 Mar 2022 19:01:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="lbiRNqbZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8849184049; Tue, 29 Mar 2022 19:00:00 +0200 (CEST) Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D017D84042 for ; Tue, 29 Mar 2022 18:59:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=3DDtDYgYKBqcHZJbSSNVVNSL.JVTb-IVVaSPZaZ.KLUe.KL@flex--ascull.bounces.google.com Received: by mail-wm1-x34a.google.com with SMTP id n19-20020a7bcbd3000000b0038c94b86258so1490363wmi.2 for ; Tue, 29 Mar 2022 09:59:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=b2PKYl5I94WeimbYfn341Gt5uuIfAsTPdhTETSUrZLs=; b=lbiRNqbZoPdqeSon9xr8L7RgjWmbWeVITaqhRMALz31ZV5iweDpI8tZcitsuEEAVI4 pV3z7XGh8gRtpZCnH81/uCG/Y5oGMH3zq5o+k/uPflfIMe0aO5xH0OnoZKWBzKH/GbO6 tujdgkbl5YO9u7sfdsca/u2LjhcVtaOBOnpmWS3581CBW2HeAcAnd3WxwXnrOjySqVyX /Ljkd6bTkmlFiX4YV/Zdpfs0IChapAW2/7YlZmTfnhfCOijI8XK979whJ8X2Yxt4WSI7 ZGTVAGOUvWIH9AVTxjZicyW8+Qqxfyaf90VCsLpI8P65I6EiTY08pYi8fEzAbTJcR9Mz JTow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=b2PKYl5I94WeimbYfn341Gt5uuIfAsTPdhTETSUrZLs=; b=sMRyQb6OjdcM1tkKABZ6xes//J30i8fhXsVEsqgeQt6f/yf+Dy2116vhenWS9DIGD9 8cUlt7AgnPpvTMNTpmRfgDBy023Lx6m9lnHoQg6Vet9ioVaCABd2tfNTXKKCiw8ebeqr vo0ZtKoXar4d9mka7w3L2xrqAxEJu7whgdKMoZj1DMZkiysG3/Wpm0Ml55gyTTREqDwu vAW6UjlHsls7OdM2Re8s5AHl27Z070JH+UpphUuyTnNDMK7bM4BJrp1gaDFtX79AS/Hu JcKOYVvGQzRfIdT58SlsTwB5n4jD4lod50Sf7WrL8nR9dUtku5Ii2e2VNbY2hnFOgTYX EKGg== X-Gm-Message-State: AOAM533SQ8U9YHTq0A6CmKtrJtGBCHdISIMU6GoKdMfC5TuH0hVjCg4k a3V2SHzJfmG10nmXtdhSryy22SgpgT/wLmadsZO2KLsAabjjn1Rt1xMvcrJ4wksjbzgc1AtO1SF Dz9KIGs1+v/LsUUbn+IH5hF33qWvRPSHrCQ5S0j4ELN+kInBxEmyrvNHUscc= X-Google-Smtp-Source: ABdhPJyq94U5hg1nRp7WXQcc8Fl7FcPKKBg+a5/t4hoya7+Uqa8Hz9UaFnVOFUYBfLva57kGQUF76GBQ8Cc= X-Received: from ascull.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1510]) (user=ascull job=sendgmr) by 2002:a05:600c:2052:b0:38c:be16:aeae with SMTP id p18-20020a05600c205200b0038cbe16aeaemr98830wmg.157.1648573196389; Tue, 29 Mar 2022 09:59:56 -0700 (PDT) Date: Tue, 29 Mar 2022 16:58:59 +0000 In-Reply-To: <20220329165900.1139885-1-ascull@google.com> Message-Id: <20220329165900.1139885-18-ascull@google.com> Mime-Version: 1.0 References: <20220329165900.1139885-1-ascull@google.com> X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog Subject: [PATCH v2 17/18] virtio: pci: Check virtio configs are mapped From: Andrew Scull To: u-boot@lists.denx.de Cc: sjg@chromium.org, bmeng.cn@gmail.com, adelva@google.com, keirf@google.com, ptosi@google.com, Andrew Scull Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Prepare for calls to `virtio_pci_map_capability()` failing by returning NULL on error. If this happens, later accesses to the pointers would be unsafe so cause the probe to fail if such an error occurs. Signed-off-by: Andrew Scull --- drivers/virtio/virtio_pci_modern.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index bf92d9d3ba..f1e64a3438 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -533,7 +533,19 @@ static int virtio_pci_probe(struct udevice *udev) return -EINVAL; } + /* Map configuration structures */ + priv->common = virtio_pci_map_capability(udev, &common_cap); + if (!priv->common) { + printf("(%s): could not map common config\n", udev->name); + return -EINVAL; + } + priv->notify_len = notify_cap.length; + priv->notify_base = virtio_pci_map_capability(udev, ¬ify_cap); + if (!priv->notify_base) { + printf("(%s): could not map notify config\n", udev->name); + return -EINVAL; + } /* * Device capability is only mandatory for devices that have @@ -545,11 +557,13 @@ static int virtio_pci_probe(struct udevice *udev) if (device) { priv->device_len = device_cap.length; priv->device = virtio_pci_map_capability(udev, &device_cap); + if (!priv->device) { + printf("(%s): could not map device config\n", + udev->name); + return -EINVAL; + } } - /* Map configuration structures */ - priv->common = virtio_pci_map_capability(udev, &common_cap); - priv->notify_base = virtio_pci_map_capability(udev, ¬ify_cap); debug("(%p): common @ %p, notify base @ %p, device @ %p\n", udev, priv->common, priv->notify_base, priv->device); -- 2.35.1.1021.g381101b075-goog