Received: by 2002:a05:6358:53a8:b0:117:f937:c515 with SMTP id z40csp5171836rwe; Tue, 18 Apr 2023 03:11:23 -0700 (PDT) X-Google-Smtp-Source: AKy350YoIaI9Ii34wnHC5q589DmLIRlalf+RoNBCEvsXLt71Gf3WYx0AKWMM8MnyPmx5WVENZM8H X-Received: by 2002:a05:6a20:431a:b0:ef:e240:b559 with SMTP id h26-20020a056a20431a00b000efe240b559mr7213367pzk.46.1681812683758; Tue, 18 Apr 2023 03:11:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681812683; cv=none; d=google.com; s=arc-20160816; b=TLTNjLd9z5O9UQiCRl0Edzspdgfb1SQyRt7PU7fqCPAkSOrvd/J0bP0G873+iAokTK VjQzvcwBC/JKiMxCj0d2iC0ejA/0Gzf94FQZy5G3a8AMjBqaI2Qggylk6Jp82hT+RNzr 9BlxqMawPD22Qt/i12kAEYNO4V7KNp2UpWsTOzCVJe2nZdUdTJv/Elgh9ZofdEHqjQ78 gLZ0YuWXkEdr6tLNMifEqycAp3s82jt0+yCz5mJX9/DEN4O5zk7uc/0/CNvAWI9HJGim 18z952qSZiN2me/AhATFLCGPAEeiowUKIG1ycnlif+BesQ2p+esCMLv03zeW+J+kSE4E 92fw== 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=kkPmtUJM/y/8ZMLgmPzrDpSz/aD5s4kTz4AWJ+kwyns=; b=yPJ3hG/PN4wfS6KhMrKnD8iyjY0PniN7D1cA8WG/egeUkUpjXK/WRwN3DtSUDO9AMM w0d/m4YwIcda5dqi1yaUnKrwLOuEj31FJti0d2K+YoqBSIJqaBJ8BYRz6mzpVq1KVsij nDanwbXf4sRZ+4CJjxX8HPitQB9cPjamm6aZwlG9AG401o324ofSmIWGv3mj7WaOYL7/ em1wJwMrcq6NILna5ZDYKS37fYIk+/RBXmsfab/TrTRyIXVzDlzinTUP1QA5fc+figc8 pubGDY9Q8cPqbsMq0i7O4RvnpfQ00lj0YKwyJVZNsCkhWYIpjhgNht1l8klXTiIB1PTQ k0hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FXy+hhuL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y72-20020a638a4b000000b0051b7f3f862esi10287524pgd.824.2023.04.18.03.11.10; Tue, 18 Apr 2023 03:11:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FXy+hhuL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230002AbjDRKFr (ORCPT + 99 others); Tue, 18 Apr 2023 06:05:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbjDRKFq (ORCPT ); Tue, 18 Apr 2023 06:05:46 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 892A7448B for ; Tue, 18 Apr 2023 03:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681812299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=kkPmtUJM/y/8ZMLgmPzrDpSz/aD5s4kTz4AWJ+kwyns=; b=FXy+hhuLkrzXT8MprYeWrK1kuYnjpSdY5338FXwFYs/xooNOaGvQryLazxiwwUluyW/dAp y8oWFZVbX/ps3mstfeAkPqAT4qEHH8pIEsrKFAIwzvNjDkGW7VwVQy5pIdkHiORDxlmjtD nx/a5mTKsc9X847aq/MLvIR5W6okLVw= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-374-a2_MzuasOIy1lf15vIdRRQ-1; Tue, 18 Apr 2023 06:04:58 -0400 X-MC-Unique: a2_MzuasOIy1lf15vIdRRQ-1 Received: by mail-ej1-f70.google.com with SMTP id qk25-20020a170906d9d900b0094f0dd1166dso3026651ejb.9 for ; Tue, 18 Apr 2023 03:04:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681812297; x=1684404297; 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=kkPmtUJM/y/8ZMLgmPzrDpSz/aD5s4kTz4AWJ+kwyns=; b=AqP7v95T9HGFMfcZeWJbBBy4HOYydO8hpSmrKmww/2h//en/OQ4DQloTbY6+wITNGD nd0EgPXBK3v2oC9BZUmQsmnBx7VpdJUZksftZryUP2KdwajIu/jHw8Vgd4db+Hp06o5h adBaEDVyjG9zcBdTb69/cygaJQAhREwKB5jihgsnZkaYecPJpssQQgVmPuiH0hUOY6yv iyH/Rqrmrdpv6bCcH9TysOOmacoX9g7JFcPjOWdwdUsLplv3VGlywLv2nImaU+jlQkLO m92xzlsuoNQFnPhJbijUaIcHLnQKdJJBFmlvBfDxbtXeruzs/se+6sClhdFLbGfGdCEm H4Vw== X-Gm-Message-State: AAQBX9eldRRKASOhe2tA72JHQNWZtjQ8CZX0bk2KhGVh05lzCVaPj7ZI fLmbg56TV4biPLnM29zh93g7zeZqlbQF+4v38+Rur/36Ls47PW4YOX9n34PmYhav60LNbYJt453 WC5jS1QWTe2HJWMpF/pruCgXY X-Received: by 2002:a17:906:f6cd:b0:94f:3bf7:dacf with SMTP id jo13-20020a170906f6cd00b0094f3bf7dacfmr7523192ejb.71.1681812297377; Tue, 18 Apr 2023 03:04:57 -0700 (PDT) X-Received: by 2002:a17:906:f6cd:b0:94f:3bf7:dacf with SMTP id jo13-20020a170906f6cd00b0094f3bf7dacfmr7523179ejb.71.1681812297083; Tue, 18 Apr 2023 03:04:57 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de78:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id q18-20020a170906361200b0094f124a37c4sm5131590ejb.18.2023.04.18.03.04.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 03:04:56 -0700 (PDT) From: Danilo Krummrich To: luben.tuikov@amd.com, airlied@gmail.com, daniel@ffwll.ch, l.stach@pengutronix.de, christian.koenig@amd.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH v2] drm/scheduler: set entity to NULL in drm_sched_entity_pop_job() Date: Tue, 18 Apr 2023 12:04:53 +0200 Message-Id: <20230418100453.4433-1-dakr@redhat.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It already happend a few times that patches slipped through which implemented access to an entity through a job that was already removed from the entities queue. Since jobs and entities might have different lifecycles, this can potentially cause UAF bugs. In order to make it obvious that a jobs entity pointer shouldn't be accessed after drm_sched_entity_pop_job() was called successfully, set the jobs entity pointer to NULL once the job is removed from the entity queue. Moreover, debugging a potential NULL pointer dereference is way easier than potentially corrupted memory through a UAF. Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/scheduler/sched_entity.c | 6 ++++++ drivers/gpu/drm/scheduler/sched_main.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index 15d04a0ec623..a9c6118e534b 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -448,6 +448,12 @@ struct drm_sched_job *drm_sched_entity_pop_job(struct drm_sched_entity *entity) drm_sched_rq_update_fifo(entity, next->submit_ts); } + /* Jobs and entities might have different lifecycles. Since we're + * removing the job from the entities queue, set the jobs entity pointer + * to NULL to prevent any future access of the entity through this job. + */ + sched_job->entity = NULL; + return sched_job; } diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 9b16480686f6..e89a3e469cd5 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -42,6 +42,10 @@ * the hardware. * * The jobs in a entity are always scheduled in the order that they were pushed. + * + * Note that once a job was taken from the entities queue and pushed to the + * hardware, i.e. the pending queue, the entity must not be referenced anymore + * through the jobs entity pointer. */ #include -- 2.39.2