From nobody Mon Jun 22 14:24:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60019C433F5 for ; Tue, 22 Mar 2022 15:20:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238497AbiCVPWV (ORCPT ); Tue, 22 Mar 2022 11:22:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238426AbiCVPVq (ORCPT ); Tue, 22 Mar 2022 11:21:46 -0400 Received: from mail-ej1-x649.google.com (mail-ej1-x649.google.com [IPv6:2a00:1450:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD6158B6C5 for ; Tue, 22 Mar 2022 08:20:00 -0700 (PDT) Received: by mail-ej1-x649.google.com with SMTP id ga31-20020a1709070c1f00b006cec400422fso8867025ejc.22 for ; Tue, 22 Mar 2022 08:20:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=IJFULH6pKDrAUy1ZQEAU8LTsS220SswLQoRQfxb9psg=; b=YFUn96dr37yG0lQeXq/lDO95znaH8jW2VOFdk+L86Mg83BObCFxjdq8YnJFleyb0pq cULhfsNu/0JB+CFnzxXxtV0VIMZQdSkyYRNulowbWsaeCvz8uPhL7B/et4Wizq0fCikK yTaw7DgW766ReatUBDQCTTChgqW9xD2Ynxx/GayEf9Agklkj2R5ERpGCy1n/qUjvbDzH TurXiH/dTM6/HuzX1m/e1l8CdAZzysLKZs/eDrZXxWbQ5LUIzqKHP2QDBIbkJ4L/a9yD gWd5c0WB/ayGXRmsmhbNt/Yky+Bk4Fc+hnVCMVJuYuVQPFLQHBeDPradPMyxEK+T5fMI xHwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=IJFULH6pKDrAUy1ZQEAU8LTsS220SswLQoRQfxb9psg=; b=sFWIER2STfEIhIReojYYF0jZlp2WgEY+Vzg3bRJZAKcy6jESb4U5LnBe4VKUoiDChl UdcyKoTfWv84TeLDZLMmCPHI+zbYgM7Z64Kymb/D52ILsYiOgIsmY8MJ0BflwKgyPPoF c1lUaIwsMxWRnq/yY+Pp93r2ZLgH+ZEo8F4AOeUwpUFnmnQaxTW9Jw9sbCe8T/wO5mjX zqnm4yxvNHoDiLVYKwMv/RaIyUAqo6mgeWb8zGyiF1XkYuiDynDoI679w6Cpr42Bcsey yOKJ3bPpgRqVSHrsTptA2/DEnQe8sw4ETCJcKtkj2CQeKEU5ocx3dKQZeMoQ7raJ3G65 GOaA== X-Gm-Message-State: AOAM531k5l1rg3cBppV/VY45TQj16/WOiu0iRE9ZgvPK3pM8dixJWMpr e6EnPRaOk7NEhtSxf+5u8E3PGMf2Vw== X-Google-Smtp-Source: ABdhPJxLeI2hnE89muaiQsoyzcHH44WDxqYrvusIyoe0uFU8N/jP01aruiXkOUGBs4/g8QolztLfnVbwEg== X-Received: from keirf.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:29e7]) (user=keirf job=sendgmr) by 2002:a17:906:99c3:b0:6df:a289:ed3a with SMTP id s3-20020a17090699c300b006dfa289ed3amr23196242ejn.660.1647962398266; Tue, 22 Mar 2022 08:19:58 -0700 (PDT) Date: Tue, 22 Mar 2022 15:19:52 +0000 Message-Id: <20220322151952.2950143-1-keirf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.35.1.894.gb6a874cedc-goog Subject: [PATCH v2] virtio: pci: sanity check bar indexes From: Keir Fraser To: "Michael S. Tsirkin" , Jason Wang Cc: kernel-team@android.com, Keir Fraser , virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The bar index is used as an index into the device's resource list and should be checked as within range for a standard bar. Also clean up an existing check to consistently use PCI_STD_NUM_BARS. Signed-off-by: Keir Fraser Acked-by: Jason Wang --- drivers/virtio/virtio_pci_modern.c | 10 ++++++++-- drivers/virtio/virtio_pci_modern_dev.c | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci= _modern.c index 5455bc041fb6..84bace98dff5 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -293,7 +293,7 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev,= u8 required_id, =20 for (pos =3D pci_find_capability(dev, PCI_CAP_ID_VNDR); pos > 0; pos =3D pci_find_next_capability(dev, pos, PCI_CAP_ID_VNDR)) { - u8 type, cap_len, id; + u8 type, cap_len, id, res_bar; u32 tmp32; u64 res_offset, res_length; =20 @@ -317,7 +317,12 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev= , u8 required_id, =20 /* Type, and ID match, looks good */ pci_read_config_byte(dev, pos + offsetof(struct virtio_pci_cap, - bar), bar); + bar), &res_bar); + if (res_bar >=3D PCI_STD_NUM_BARS) { + dev_err(&dev->dev, "%s: shm cap with bad bar: %d\n", + __func__, res_bar); + continue; + } =20 /* Read the lower 32bit of length and offset */ pci_read_config_dword(dev, pos + offsetof(struct virtio_pci_cap, @@ -337,6 +342,7 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev,= u8 required_id, length_hi), &tmp32); res_length |=3D ((u64)tmp32) << 32; =20 + *bar =3D res_bar; *offset =3D res_offset; *len =3D res_length; =20 diff --git a/drivers/virtio/virtio_pci_modern_dev.c b/drivers/virtio/virtio= _pci_modern_dev.c index e8b3ff2b9fbc..a6911d1e212a 100644 --- a/drivers/virtio/virtio_pci_modern_dev.c +++ b/drivers/virtio/virtio_pci_modern_dev.c @@ -35,6 +35,12 @@ vp_modern_map_capability(struct virtio_pci_modern_device= *mdev, int off, pci_read_config_dword(dev, off + offsetof(struct virtio_pci_cap, length), &length); =20 + if (bar >=3D PCI_STD_NUM_BARS) { + dev_err(&dev->dev, + "virtio_pci: bad capability bar %u\n", bar); + return NULL; + } + if (length <=3D start) { dev_err(&dev->dev, "virtio_pci: bad capability len %u (>%u expected)\n", @@ -120,7 +126,7 @@ static inline int virtio_pci_find_capability(struct pci= _dev *dev, u8 cfg_type, &bar); =20 /* Ignore structures with reserved BAR values */ - if (bar > 0x5) + if (bar >=3D PCI_STD_NUM_BARS) continue; =20 if (type =3D=3D cfg_type) { --=20 2.35.1.894.gb6a874cedc-goog