Received: by 2002:ab2:b82:0:b0:1f3:401:3cfb with SMTP id 2csp440303lqh; Thu, 28 Mar 2024 06:45:16 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVE8qGAyeFyitfPSt7oO4VXmHKssWwDF4zIjDVteu7V6IVP0ht7zWtr93GPdMTNVFmFOa6ehPAdYXe5mQf3Hgz5zZ+viB8cAHh7jmTkKg== X-Google-Smtp-Source: AGHT+IHJqRI6KkISKAirnrhvvcowbUoKU46sn1mYMnmYqtlSFP0gl1vot9oG6WLfBehHg76kYJXR X-Received: by 2002:a17:906:11cd:b0:a47:4ae0:3bb9 with SMTP id o13-20020a17090611cd00b00a474ae03bb9mr1764976eja.23.1711633516681; Thu, 28 Mar 2024 06:45:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711633516; cv=pass; d=google.com; s=arc-20160816; b=g80AOgEGOwKf2sXzXBqsSvxyhRQK92FlMuJrNAJc1z+NndkM+vhz+T8dtN3O3a+RD2 8Kd1JzB0I1Q528NEnGYRVgBYadfM6olKPGzY+3Mgw1jeBH5Z+04I12oXIonEHjm3FYtK gThn/oHXsBwy5XeowzN/VVlnbu+QiCHxn8YGr1u+BMWaMyL4rXUYJMFaX0nfrbz41isy du/pBMdiNYsy79CqcqJK07KO430cUrDvS/Rp6a7lHQT9ecp08td3k+pa7/OHL2kQbAWT di/Atvjj2Xftj7PsYNyWGUnzEKqx46lgarK7nASxdxcUjAafvGhN6C4yaU7aU98GP5BO /fqg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=S0ld9ottGtMP3PSLHeDCuhhunV2RKSWGGUbt6pNFLTE=; fh=V36KwWWWYeep/VDCsxY0L7La6wCyxMm0bMTahmNTypA=; b=t6BCjhiHIZEPBAEJzBWbMHVF8i0yraMKbLhWm6kcDiSvw3/VPtQRu0wGo34cyTUeA9 cokaau/kTrq6ApB3uKpomSGsJ2lt+CVbmphrdqwS79ci686KfN40LSYIEY6znmOYFFC5 7tVYdEwW4xR/nd/MUa/p8AWMTpumecpbSR3mrBcT8IJ9aydBkBhUEkG/JHZghRoJfpUK FlJ6TtjWDLvu8C49YFc0OAZGAX+7ogYnub5gTA7QHAawkipxIkSllXuSasfjGkPd8te+ jw/59xyQYgJ47C0L/Rc8y9C1SdmlfJ+JTpK0d1G1bfG2uV2Hvgenjmw81xw1jFAiznb6 4bBg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ASfoX7nY; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-122984-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-122984-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id ws6-20020a170907704600b00a46a13e555csi782327ejb.838.2024.03.28.06.45.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 06:45:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-122984-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ASfoX7nY; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-122984-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-122984-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 6B6701F263A9 for ; Thu, 28 Mar 2024 13:45:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 33EDD81737; Thu, 28 Mar 2024 13:44:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ASfoX7nY" Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2667651AE for ; Thu, 28 Mar 2024 13:44:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711633492; cv=none; b=X60e5cmzPTjo9wKcahstKg13wbwnQoqwEneHeQ64KurhynIbVz/u226B0ntj1k7bXmkkdMBicZ4cF2EywxJhgv3cHH4F4I4HDEG42B7XKFCLCnKdYyBMM5oqU+s8fTINxy7mBlrSVQWqlsM4qiGxSCe3IeA5JlDQb1hlaW/qSXA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711633492; c=relaxed/simple; bh=1b0kDwcvNj5vH5K0pAK4HupQheat89mZSwQWjzdBGDQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=EQ597jsuSHDOx3cUrXfZvdKdZt5l7bQR9SKfzD4DN5zRpmRzrzfs0usvXYJwRAEQ2bd/gTREgi7C85wo+tkcJ0nWM81bbZghJqlzsWzXhwLSfNknMd/uOjx3PPODNkqN5kKIGjOpdDfzzdWmowVbd1H0BmUwBpMM60DDxjt0cso= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ASfoX7nY; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-513e25afabaso979276e87.2 for ; Thu, 28 Mar 2024 06:44:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711633489; x=1712238289; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=S0ld9ottGtMP3PSLHeDCuhhunV2RKSWGGUbt6pNFLTE=; b=ASfoX7nYjpQbJfFxFU/oJWW8pxd61ieqf8IUmgk7aFcdkycZg4nspm7XOWgoOy1nQw LAkAwkg+SaJv/IC9uvo3WEEC/p2W52+y37fRQF+qK2keUNdvPflQ+PxI7pzixmBp6bxG vs6txCKb+oLPfq/AKeiJ40dtn7kvOft2vfUP+QUmqE7N071sOyvZjQixvFKqDPZaePtA wdlKdB9+BJVTK5G4kCkNcWzaSnpWwG5k9CVaQjczRgImiaapkhoxxlVQ1u1qI5+oIylv Q5+m21Ls5DMdoSrelILEHrVPXCIlhKteOhQDoS04IaNzmKx7E5R1DrxRC/4zcyQ1uXHb BKRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711633489; x=1712238289; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=S0ld9ottGtMP3PSLHeDCuhhunV2RKSWGGUbt6pNFLTE=; b=SX7vOsRaAb1NWZ0BROkbtc2/FFNkJW0EtUMHjxNwDuNRyMYvz3xIswKxKuU+bY+KWb bDsXqwWLWB6EHUEvTDB6c7HpH4UbqxKpvKs+hKWv9d+1m2oGuLCgdzAHAfRKWptMgRjf wVSPHWbOEba/yUjBdlOHidO1noMjakXD4ko7phd8I/qw8Qhie0MwH4RQGEDCkC+T/73S /o32e+q9WgLKXAEMo7gy1A9nZynWXLzA4yQvNU0qtA1Hp6JcZiYSK0wmqzCva+99h4kk fBRNR1eJsCjB2iHo6Woiy9FxlhiWY2bKYDfcG96HEK9OvxPmXtPvLKgd0s2Vb7T+gNXC pqZQ== X-Forwarded-Encrypted: i=1; AJvYcCWXDJLS6gSXlt7vgmprpfmwsajk2U6utGJkqEiI5neUwIuuigG/wYL/0gzTtd9vhplIX0Qd/x+se4RTHqZ+RJRjz8/gpZOTe7KTSA/k X-Gm-Message-State: AOJu0YxCLdbLam+hY4njtuY/qX7MTXISqreXLnkBX+FNcMBoM+882OA4 RihnECXF8q7iscu8UrWGyk05chxVPQgdrEdzoGarsaxAODVxQHI4 X-Received: by 2002:ac2:4642:0:b0:513:bf6e:bf05 with SMTP id s2-20020ac24642000000b00513bf6ebf05mr1858320lfo.14.1711633487520; Thu, 28 Mar 2024 06:44:47 -0700 (PDT) Received: from localhost.localdomain ([212.22.67.162]) by smtp.gmail.com with ESMTPSA id b26-20020ac247fa000000b005159b7007aesm212501lfp.153.2024.03.28.06.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 06:44:47 -0700 (PDT) From: Maxim Korotkov To: David Airlie Cc: Maxim Korotkov , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Daniel Vetter , Emil Velikov , Ivan Kapranov , lvc-project@linuxtesting.org, dri-devel@lists.freedesktop.org, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] drm/virtio: add driver_priv validation in virtio_gpu_create_context Date: Thu, 28 Mar 2024 16:43:51 +0300 Message-Id: <20240328134351.298050-1-korotkov.maxim.s@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The pointer file->driver_priv was dereferenced without checking against NULL, but in the "virtio_gpu_transfer_to_host_ioctl" function it was checked against NULL after calling virtio_gpu_create_context function. Found by Security Code and Linux Verification Center(linuxtesting.org) Fixes: 72b48ae800da ("drm/virtio: enqueue virtio_gpu_create_context after the first 3D ioctl") Signed-off-by: Maxim Korotkov --- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index e4f76f315550..98fe9ad4ed15 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c @@ -64,6 +64,9 @@ void virtio_gpu_create_context(struct drm_device *dev, struct drm_file *file) struct virtio_gpu_device *vgdev = dev->dev_private; struct virtio_gpu_fpriv *vfpriv = file->driver_priv; + if (!vfpriv) + return; + mutex_lock(&vfpriv->context_lock); if (vfpriv->context_created) goto out_unlock; -- 2.34.1