From patchwork Thu Feb 22 22:50:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bethany Jamison X-Patchwork-Id: 1903022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TgpKC73tkz23pN for ; Fri, 23 Feb 2024 09:51:11 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rdHu7-0004TR-1o; Thu, 22 Feb 2024 22:50:59 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rdHu4-0004SN-9A for kernel-team@lists.ubuntu.com; Thu, 22 Feb 2024 22:50:56 +0000 Received: from mail-io1-f71.google.com (mail-io1-f71.google.com [209.85.166.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 059E640C9D for ; Thu, 22 Feb 2024 22:50:54 +0000 (UTC) Received: by mail-io1-f71.google.com with SMTP id ca18e2360f4ac-7c7877d4e2eso21058439f.3 for ; Thu, 22 Feb 2024 14:50:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708642252; x=1709247052; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pd754VM2+WSsSd7O+Eslcsp6xfIBxEHHo0BWxYjdAJM=; b=el3RE6b1zbTtCMl/onioZLpc6ZsdIJDXzTKVsyZ2rd2QTAB/aSGCSY/kzXoIucXqQf QwMvq8Fd3w1gPnMnR8Rmq1nt+E94R8q8ns/jWIWK+rtSjIlngQbleVccPbhTrpNb5Elz sK2Dk7mT33AG75Xn7uDs4U9CTj47JvnwZ05IFKy+/lGusWCSbewj7G48sDQ2VPn2VVpu wp9fHUsGEAUERBJz3zSBKlwnXbLEZHlQPKhqJ4y+N9aX5LmhUvwiJBpeN4gjOPIqV7fV GS+iB6a5jESqn2s7uFatOzlPRxiqDWTFMedcxIDzpV//gQNcDFanEZ+z5YHSOYxwdla4 0BwQ== X-Gm-Message-State: AOJu0YyCMg2MY9LZ5DUEbjJssXQvbY7l+JmXvV8V6QZx7YRCOHiAfNO9 J/n+tof5jZWHeuLQ/+YtEfkk7CsZzxQAoIFB+LuuCHSvTg5VrUUKH74Rn/qaFJViUSg+Uplp+lq mBF/d6SX4hldcPIeQNdOnQWcgszcNYR2+d0qAhwwlUjGWSDeob+zIaA9A7EYlzCGPIr7tx/ilQe byMziZ2+WmxA== X-Received: by 2002:a5e:df0a:0:b0:7c4:713c:8745 with SMTP id f10-20020a5edf0a000000b007c4713c8745mr343475ioq.12.1708642252532; Thu, 22 Feb 2024 14:50:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpXlij4Q+Jqh/H509cdeuOIr+QcXlWJge/e1rc7LKPrHh+aE7yTY55yKC2SVs51gUhv/0gVQ== X-Received: by 2002:a5e:df0a:0:b0:7c4:713c:8745 with SMTP id f10-20020a5edf0a000000b007c4713c8745mr343472ioq.12.1708642252156; Thu, 22 Feb 2024 14:50:52 -0800 (PST) Received: from smtp.gmail.com (104-218-69-129.dynamic.lnk.ne.allofiber.net. [104.218.69.129]) by smtp.gmail.com with ESMTPSA id r1-20020a056638100100b00474558a20a3sm536547jab.140.2024.02.22.14.50.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 14:50:51 -0800 (PST) From: Bethany Jamison To: kernel-team@lists.ubuntu.com Subject: [SRU][Focal][PATCH 2/3] drm/qxl: allocate dumb buffers in ram Date: Thu, 22 Feb 2024 16:50:48 -0600 Message-Id: <20240222225049.72030-3-bethany.jamison@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240222225049.72030-1-bethany.jamison@canonical.com> References: <20240222225049.72030-1-bethany.jamison@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Gerd Hoffmann dumb buffers are shadowed anyway, so there is no need to store them in device memory. Use QXL_GEM_DOMAIN_CPU (TTM_PL_SYSTEM) instead. Signed-off-by: Gerd Hoffmann Acked-by: Thomas Zimmermann Link: http://patchwork.freedesktop.org/patch/msgid/20210204145712.1531203-11-kraxel@redhat.com (cherry picked from commit f4a84e165e6d58606097dd07b5b78767a94b870c) CVE-2023-39891 Signed-off-by: Bethany Jamison --- drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/qxl/qxl_dumb.c b/drivers/gpu/drm/qxl/qxl_dumb.c index bddd6544f2c8..7a79da125547 100644 --- a/drivers/gpu/drm/qxl/qxl_dumb.c +++ b/drivers/gpu/drm/qxl/qxl_dumb.c @@ -61,7 +61,7 @@ int qxl_mode_dumb_create(struct drm_file *file_priv, surf.data = 0; r = qxl_gem_object_create_with_handle(qdev, file_priv, - QXL_GEM_DOMAIN_SURFACE, + QXL_GEM_DOMAIN_CPU, args->size, &surf, &qobj, &handle); if (r)