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 >