From patchwork Fri Dec 8 17:08:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 175947 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5592272vqy; Fri, 8 Dec 2023 09:09:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0rDZwuf1KAWwzxQFustQHwTYl3dTd4o+ZbsKXqBmmbIosKWJkr6GYP76ubb00aQuwRNTa X-Received: by 2002:a05:6a00:2401:b0:6ce:53f6:1ee1 with SMTP id z1-20020a056a00240100b006ce53f61ee1mr348123pfh.15.1702055352146; Fri, 08 Dec 2023 09:09:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702055352; cv=none; d=google.com; s=arc-20160816; b=i80mBOf8BdGWY/kuZ+3m6TZdEJJMok/iIWOtmICgs5DgJ+9mqsLZp2cx0DmhWJ9tLh 5zTmtao5LPB1H/zBf5HZAQxKpPGjQ8Js/St9+wdikJzsQrCiquExGAPonAVjtRBxJPFa 3/yewqOSWBEhfRMTHG5QmWTqXWxOZhz0DTiaHZA7vNYEC1+OKFn3U17XAvJDh2rJJsnM Rq8DgFxUt3hg+xIhZNPi2O4YxEord0qiQizYNaLo8IW2xlnKBbGweRmEmz6EEh4YOCsK 9RSJNmmDiMiaRRc8zHUpPOncNcVzHC6ByD4z80SKsSsI9trJeouytySOJCNkRfu5HaHk oC+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=XVyGqXIqWznKFmI6wLzi11NM/yRQinuNhq1yEIojuaw=; fh=E6LrSisPZuY1lXu+/CPgIkcE6IaZVl1jLwr/jL1+92s=; b=Sb1M/7Jx6hskdLYlFMBXLCStw4LBgvEMR71lnAOhmDU50zNY1EmlzAsV1tEfAZY/PC z0nzg18i6SgEPV2jmDFUWM1XVZ3u4i2iUoLajTPm4jB6O+obO24r7zA3vvzr4v8ll0qV HslFyUAa3/wSDOg/QKr2TjoL70ruBSXyUuXQk7KWJxIbMOc/ZZSdcpaUW3Xssoo3gpkK x95FHAIg1vy3l5mXHP6EFvnFRH6ptclWMGFzoOxqpmu1yczH6nvK+9poKY4HlRo/BpnM Oh3WDeafhUBKsdVmAuEi62IGH6IWGqWaRe3hVmX+AbpW5ax8SnyFS9sL2x90lS8+Jwdk LmIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=l5SC3H7M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id fj38-20020a056a003a2600b006be04b8c3basi1841782pfb.178.2023.12.08.09.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 09:09:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=l5SC3H7M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 145FC84A3648; Fri, 8 Dec 2023 09:09:06 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233804AbjLHRI4 (ORCPT + 99 others); Fri, 8 Dec 2023 12:08:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1574187AbjLHRIy (ORCPT ); Fri, 8 Dec 2023 12:08:54 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64161199B for ; Fri, 8 Dec 2023 09:09:00 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40c2c5a8150so18999755e9.2 for ; Fri, 08 Dec 2023 09:09:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702055339; x=1702660139; 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=XVyGqXIqWznKFmI6wLzi11NM/yRQinuNhq1yEIojuaw=; b=l5SC3H7M1o30t46BXAcrsD8ORY6RI/ftDbPP0otJtBVH85hIUXnmVpWtT9IXBiT3P+ 4ZXNaOlcBts5g8DYZaTF9vtPQnvYd6nUOhE+1pvOjc9+B3g5nJYoG7EFFSjkQIDiNDJl eKnwbGkH+gP5Qjq8dAV5zwyKbww8U5GYFjkqN51hcMfzQiIX7opc8HaBgvduObL8EvC6 2Y/TEXizYKd1hogUhifDB42VZoQqEqzjkUJn24Xu1DnDHlZgvo+4u75X9xp4hCW0HUtQ h9SM81WAJIIk0u1jusrFGDY1p8a8+lfOuysPRoiUBuWMI6EAFpSFhswxsMZFNRnxMEts BvOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702055339; x=1702660139; 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=XVyGqXIqWznKFmI6wLzi11NM/yRQinuNhq1yEIojuaw=; b=sAoyNLPPGRLJLJu10WDXqFLr4E6jDUvu/cIitmWJfQUeENtPeQP4Li+dTnT7mZ3NBI I8N3Nvf6QzkLcoPAcFSyF9U+bSuoXAzLex7WTDnbBLY8W56uFi4Fmry4TYpUQGlka0Q2 RWRZfh9ZQHlyUEQxxrLljiwBpNtziyZ3yhDli5gCEOnjqTR1Ab0EEhDUWquxfCrHp3Yo 2vNzR7YD0rvED2vgeLF5ltuAeOW/lQ73a03TuHSyNapeYeDyvnfEPXDkiFx8sVIYziXj Ek9eNh6SQIJ00vFl1zEZtSmAOO/rjpd/mc6wGW4runXra93eGiVK8f7QOXjhP3+/SU5m m3rA== X-Gm-Message-State: AOJu0YyvvkugKTcdsTAGwQoWVRJkHjsVuQR7WiwSaweOrxvxiLZWB9HW GAgyJDKEkmmmin5Pg2W2+g== X-Received: by 2002:a05:600c:1d15:b0:40b:5e21:ec49 with SMTP id l21-20020a05600c1d1500b0040b5e21ec49mr151241wms.123.1702055338662; Fri, 08 Dec 2023 09:08:58 -0800 (PST) Received: from U4.lan ([2a02:810b:f40:4300:79e9:c218:2514:2131]) by smtp.gmail.com with ESMTPSA id z17-20020a5d44d1000000b003334a0513dbsm2421835wrr.67.2023.12.08.09.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 09:08:58 -0800 (PST) From: Alex Bee To: Frank Binns , Donald Robson , Matt Coster , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Cc: David Airlie , Daniel Vetter , Sarah Walker , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Alex Bee Subject: [PATCH] drm/imagination: vm: Fix heap lookup condition Date: Fri, 8 Dec 2023 18:08:56 +0100 Message-ID: <20231208170856.1748413-1-knaerzche@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Fri, 08 Dec 2023 09:09:06 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784734392700064519 X-GMAIL-MSGID: 1784734392700064519 When conditionally checking for heap existence of a certian address in pvr_vm_bind_op_map_init the condition whether the map request comes from a user is incorrect: The context must not be the kernel-context to be a user(space) context and should be looked up in pvr_heaps. That makes addresses coming from userspace not being verfied against the defined ranges and prevents firmware loading for meta cores. Fixes: ff5f643de0bf ("drm/imagination: Add GEM and VM related code") Signed-off-by: Alex Bee Reviewed-by: Donald Robson --- drivers/gpu/drm/imagination/pvr_vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imagination/pvr_vm.c b/drivers/gpu/drm/imagination/pvr_vm.c index f42345fbe4bf..82690cee978c 100644 --- a/drivers/gpu/drm/imagination/pvr_vm.c +++ b/drivers/gpu/drm/imagination/pvr_vm.c @@ -225,7 +225,7 @@ pvr_vm_bind_op_map_init(struct pvr_vm_bind_op *bind_op, u64 device_addr, u64 size) { struct drm_gem_object *obj = gem_from_pvr_gem(pvr_obj); - const bool is_user = vm_ctx == vm_ctx->pvr_dev->kernel_vm_ctx; + const bool is_user = vm_ctx != vm_ctx->pvr_dev->kernel_vm_ctx; const u64 pvr_obj_size = pvr_gem_object_size(pvr_obj); struct sg_table *sgt; u64 offset_plus_size;