From mboxrd@z Thu Jan 1 00:00:00 1970 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 201EDC433EF for ; Mon, 28 Mar 2022 21:08:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229920AbiC1VKY (ORCPT ); Mon, 28 Mar 2022 17:10:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229662AbiC1VKQ (ORCPT ); Mon, 28 Mar 2022 17:10:16 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1AEF20F7C for ; Mon, 28 Mar 2022 14:08:33 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id r13so31221369ejd.5 for ; Mon, 28 Mar 2022 14:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Gy52q0hk0EOe2yARL7BLFUrhC07yc/LGzLY5hvJWd9Q=; b=PspVM/NGsYmmepvwb7RIAfO4OVL1acnHrWJHnRYbUv5gXs6ulNmvXMW2TyCbx5Q7Yk RcTiAFURzmyQiGtT6oGZjLVWGifIlTDuAhMA1jenOe/Ptz3rorytIwMJ6Y9H0kribuVR NjaBTSekKRGEvfLcvBKtlgYJu4sjoYMv/TRgRND2J+PaeJymdZeJEpUm2ndWoLA12z6a 0+BxKzfI8SwJ521yviTn1P6Xfn9uwZ9Dc2knM62zK++NGw1xu9YpOev6kwIoarH0ywVl C5/NNpMFgBtOIpU4gEwMOduyuUFvYSMvVNeWJBoPg0SXvoZ4uLz5BOXexjGT8HlcE05X kcZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Gy52q0hk0EOe2yARL7BLFUrhC07yc/LGzLY5hvJWd9Q=; b=cs86zCo9syL4aO5m2lBRunTSG9mxqUZdihqM0u45GBFyqzQfiEt6uwyETfnjHJg8TJ IfAm8YBNn+8E/UOYtfjXjzuim0MHaZooV1yqPNZH1puqCX98fjLX50Zc6C0442Nayfwn UOUh8Oe+DAUgpDdtGOicKell1QOvNqRcdFXR9uYA6IHazYQOqrC54rgcHWutD5hgPHMq x9E6dVl6UwfkajWAjZvsiVGKkaWc7P3DaMUzztlSjHDS9m9vxHGHzCOtDi3wIepr6Z1z /pdofLKbo4rRXss6U9DWxnPefQE1p5Q9njbWEugz0OSq8ubjMMdC+s9sv3zKa9Dg15YQ g56Q== X-Gm-Message-State: AOAM531KmeApUq1AA38NFNQL0mD5IioQ1ofWtkHvPLb4YSxGZZo4CVVE B+XBmzMqgvjMMbU3p+baa57DrBsgUwPjXDii2Do= X-Google-Smtp-Source: ABdhPJzF/ITADHePLd7Kqd1BNDEpYjsT1pDu1lP5yP42YMsGsMH5XWm/84sNviYmE9deBAzqOUwNaIpmQ1r5e4feVGc= X-Received: by 2002:a17:907:3e92:b0:6df:cb08:14f5 with SMTP id hs18-20020a1709073e9200b006dfcb0814f5mr31124556ejc.308.1648501711578; Mon, 28 Mar 2022 14:08:31 -0700 (PDT) MIME-Version: 1.0 References: <20220327050945.1614-1-xiam0nd.tong@gmail.com> In-Reply-To: <20220327050945.1614-1-xiam0nd.tong@gmail.com> From: Chia-I Wu Date: Mon, 28 Mar 2022 14:08:20 -0700 Message-ID: Subject: Re: [PATCH] virtio-gpu: fix a missing check to avoid NULL dereference To: Xiaomeng Tong Cc: David Airlie , Gerd Hoffmann , Gurchetan Singh , Daniel Vetter , Dave Airlie , ML dri-devel , "open list:VIRTIO CORE, NET AND BLOCK DRIVERS" , open list Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Mar 26, 2022 at 10:09 PM Xiaomeng Tong wrote: > > 'cache_ent' could be set NULL inside virtio_gpu_cmd_get_capset() > and it will lead to a NULL dereference by a lately use of it > (i.e., ptr = cache_ent->caps_cache). Fix it with a NULL check. > > Fixes: 62fb7a5e10962 ("virtio-gpu: add 3d/virgl support") > Signed-off-by: Xiaomeng Tong Reviewed-by: Chia-I Wu > --- > drivers/gpu/drm/virtio/virtgpu_ioctl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c > index c708bab555c6..b0f1c4d8fd23 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c > +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c > @@ -579,8 +579,10 @@ static int virtio_gpu_get_caps_ioctl(struct drm_device *dev, > spin_unlock(&vgdev->display_info_lock); > > /* not in cache - need to talk to hw */ > - virtio_gpu_cmd_get_capset(vgdev, found_valid, args->cap_set_ver, > + ret = virtio_gpu_cmd_get_capset(vgdev, found_valid, args->cap_set_ver, > &cache_ent); > + if (ret) > + return ret; > virtio_gpu_notify(vgdev); > > copy_exit: > > base-commit: f443e374ae131c168a065ea1748feac6b2e76613 > -- > 2.17.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 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 smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5E710C433EF for ; Mon, 28 Mar 2022 21:08:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0A20760F4C; Mon, 28 Mar 2022 21:08:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P4pezklLG8x0; Mon, 28 Mar 2022 21:08:37 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9E5B760899; Mon, 28 Mar 2022 21:08:36 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 818C9C001D; Mon, 28 Mar 2022 21:08:36 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 95AFDC0012 for ; Mon, 28 Mar 2022 21:08:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 7604681313 for ; Mon, 28 Mar 2022 21:08:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ixFSr7Q_RYn9 for ; Mon, 28 Mar 2022 21:08:33 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by smtp1.osuosl.org (Postfix) with ESMTPS id AC867812DC for ; Mon, 28 Mar 2022 21:08:33 +0000 (UTC) Received: by mail-ej1-x62d.google.com with SMTP id bg10so31227261ejb.4 for ; Mon, 28 Mar 2022 14:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Gy52q0hk0EOe2yARL7BLFUrhC07yc/LGzLY5hvJWd9Q=; b=PspVM/NGsYmmepvwb7RIAfO4OVL1acnHrWJHnRYbUv5gXs6ulNmvXMW2TyCbx5Q7Yk RcTiAFURzmyQiGtT6oGZjLVWGifIlTDuAhMA1jenOe/Ptz3rorytIwMJ6Y9H0kribuVR NjaBTSekKRGEvfLcvBKtlgYJu4sjoYMv/TRgRND2J+PaeJymdZeJEpUm2ndWoLA12z6a 0+BxKzfI8SwJ521yviTn1P6Xfn9uwZ9Dc2knM62zK++NGw1xu9YpOev6kwIoarH0ywVl C5/NNpMFgBtOIpU4gEwMOduyuUFvYSMvVNeWJBoPg0SXvoZ4uLz5BOXexjGT8HlcE05X kcZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Gy52q0hk0EOe2yARL7BLFUrhC07yc/LGzLY5hvJWd9Q=; b=GmYXI1dWil2lfASobZfT/lbWRBMcalxyzTBSg5pA8hukiue7B7aJk0WtD/YSl2ztiS giwJbKdqHZBKlJ/muEsFzWhKLK4waTdIkdXb/nalM/ZVW1Dsy+5oHedyUm1ylJ0xprvb FtuR6S0KEBZa5v/sJiXasSHL2gB1MtEHD5WYTEJE84U7XdRjWfonGKRJQHOJluIpZgWB B8s2a05ZByQt97T3Q5LKfIxg8wRMxeiYDOy7MVH4weUKH4wfT1DLkQv2GzrN3GhcG+j0 UtWia3+scRfwD17EvMnb1psJTirzZKWRXHnLQFmozQmmkb7ZiIKQ9oFGebejv9Vn4dvQ B/+g== X-Gm-Message-State: AOAM530GdpW6jLce2IjqnbgbwSBHHG6d00pW/gHdIZO+zW/+suahDCQ4 H83fKkSxVHxipYzBJBmat9WuCiCSKJbApLcdJH8= X-Google-Smtp-Source: ABdhPJzF/ITADHePLd7Kqd1BNDEpYjsT1pDu1lP5yP42YMsGsMH5XWm/84sNviYmE9deBAzqOUwNaIpmQ1r5e4feVGc= X-Received: by 2002:a17:907:3e92:b0:6df:cb08:14f5 with SMTP id hs18-20020a1709073e9200b006dfcb0814f5mr31124556ejc.308.1648501711578; Mon, 28 Mar 2022 14:08:31 -0700 (PDT) MIME-Version: 1.0 References: <20220327050945.1614-1-xiam0nd.tong@gmail.com> In-Reply-To: <20220327050945.1614-1-xiam0nd.tong@gmail.com> From: Chia-I Wu Date: Mon, 28 Mar 2022 14:08:20 -0700 Message-ID: Subject: Re: [PATCH] virtio-gpu: fix a missing check to avoid NULL dereference To: Xiaomeng Tong Cc: David Airlie , open list , ML dri-devel , Gurchetan Singh , Daniel Vetter , Dave Airlie , "open list:VIRTIO CORE, NET AND BLOCK DRIVERS" X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" On Sat, Mar 26, 2022 at 10:09 PM Xiaomeng Tong wrote: > > 'cache_ent' could be set NULL inside virtio_gpu_cmd_get_capset() > and it will lead to a NULL dereference by a lately use of it > (i.e., ptr = cache_ent->caps_cache). Fix it with a NULL check. > > Fixes: 62fb7a5e10962 ("virtio-gpu: add 3d/virgl support") > Signed-off-by: Xiaomeng Tong Reviewed-by: Chia-I Wu > --- > drivers/gpu/drm/virtio/virtgpu_ioctl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c > index c708bab555c6..b0f1c4d8fd23 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c > +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c > @@ -579,8 +579,10 @@ static int virtio_gpu_get_caps_ioctl(struct drm_device *dev, > spin_unlock(&vgdev->display_info_lock); > > /* not in cache - need to talk to hw */ > - virtio_gpu_cmd_get_capset(vgdev, found_valid, args->cap_set_ver, > + ret = virtio_gpu_cmd_get_capset(vgdev, found_valid, args->cap_set_ver, > &cache_ent); > + if (ret) > + return ret; > virtio_gpu_notify(vgdev); > > copy_exit: > > base-commit: f443e374ae131c168a065ea1748feac6b2e76613 > -- > 2.17.1 > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D718CC433EF for ; Mon, 28 Mar 2022 21:08:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B6D110E0EA; Mon, 28 Mar 2022 21:08:34 +0000 (UTC) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by gabe.freedesktop.org (Postfix) with ESMTPS id 68D3610E0EA for ; Mon, 28 Mar 2022 21:08:33 +0000 (UTC) Received: by mail-ej1-x629.google.com with SMTP id a8so31155833ejc.8 for ; Mon, 28 Mar 2022 14:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Gy52q0hk0EOe2yARL7BLFUrhC07yc/LGzLY5hvJWd9Q=; b=PspVM/NGsYmmepvwb7RIAfO4OVL1acnHrWJHnRYbUv5gXs6ulNmvXMW2TyCbx5Q7Yk RcTiAFURzmyQiGtT6oGZjLVWGifIlTDuAhMA1jenOe/Ptz3rorytIwMJ6Y9H0kribuVR NjaBTSekKRGEvfLcvBKtlgYJu4sjoYMv/TRgRND2J+PaeJymdZeJEpUm2ndWoLA12z6a 0+BxKzfI8SwJ521yviTn1P6Xfn9uwZ9Dc2knM62zK++NGw1xu9YpOev6kwIoarH0ywVl C5/NNpMFgBtOIpU4gEwMOduyuUFvYSMvVNeWJBoPg0SXvoZ4uLz5BOXexjGT8HlcE05X kcZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Gy52q0hk0EOe2yARL7BLFUrhC07yc/LGzLY5hvJWd9Q=; b=6M4ms7ZKOgGPckIMWFamWplrSe3lIcCzDD4LO50Ws3tnAUiUZDc34Z6m40+oRHmVB4 TeThxEE5TS99SMc5kdh0nO/qu9ZLZsN2MP1g/LOl2bLnYMp3qkK4RwoxlRNG/obAEbUz 1By4S73TX92wN3kapkVToDwA1xmZE36ZHXwcTxTj9Jejf6zPQk9EpVEAzE2V7XyjCzxi 5SG3Vb/Gvh/uU5ilSpt0t4yOkDWwqckOLhm5Nev9w0CeqBfcWUm1g/WcdVTD7WdwNYY4 7JahiMRCGcSCxXBpeEfVlKdFexsOLNKfFLU2zSEdS0WkV1u62VT/MHxCLxAkBCPpO+hE Swrw== X-Gm-Message-State: AOAM532CNJVSr61xvFbEYSWk/wR35Avw7WIIaHKq+fzCokkU8fvBoVys MXpcDY4Df0ujikzr6AS+N1TV/N0wv3MUOCDjxHA= X-Google-Smtp-Source: ABdhPJzF/ITADHePLd7Kqd1BNDEpYjsT1pDu1lP5yP42YMsGsMH5XWm/84sNviYmE9deBAzqOUwNaIpmQ1r5e4feVGc= X-Received: by 2002:a17:907:3e92:b0:6df:cb08:14f5 with SMTP id hs18-20020a1709073e9200b006dfcb0814f5mr31124556ejc.308.1648501711578; Mon, 28 Mar 2022 14:08:31 -0700 (PDT) MIME-Version: 1.0 References: <20220327050945.1614-1-xiam0nd.tong@gmail.com> In-Reply-To: <20220327050945.1614-1-xiam0nd.tong@gmail.com> From: Chia-I Wu Date: Mon, 28 Mar 2022 14:08:20 -0700 Message-ID: Subject: Re: [PATCH] virtio-gpu: fix a missing check to avoid NULL dereference To: Xiaomeng Tong Content-Type: text/plain; charset="UTF-8" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , open list , ML dri-devel , Gurchetan Singh , Gerd Hoffmann , Dave Airlie , "open list:VIRTIO CORE, NET AND BLOCK DRIVERS" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Sat, Mar 26, 2022 at 10:09 PM Xiaomeng Tong wrote: > > 'cache_ent' could be set NULL inside virtio_gpu_cmd_get_capset() > and it will lead to a NULL dereference by a lately use of it > (i.e., ptr = cache_ent->caps_cache). Fix it with a NULL check. > > Fixes: 62fb7a5e10962 ("virtio-gpu: add 3d/virgl support") > Signed-off-by: Xiaomeng Tong Reviewed-by: Chia-I Wu > --- > drivers/gpu/drm/virtio/virtgpu_ioctl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c > index c708bab555c6..b0f1c4d8fd23 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c > +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c > @@ -579,8 +579,10 @@ static int virtio_gpu_get_caps_ioctl(struct drm_device *dev, > spin_unlock(&vgdev->display_info_lock); > > /* not in cache - need to talk to hw */ > - virtio_gpu_cmd_get_capset(vgdev, found_valid, args->cap_set_ver, > + ret = virtio_gpu_cmd_get_capset(vgdev, found_valid, args->cap_set_ver, > &cache_ent); > + if (ret) > + return ret; > virtio_gpu_notify(vgdev); > > copy_exit: > > base-commit: f443e374ae131c168a065ea1748feac6b2e76613 > -- > 2.17.1 >