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;
Message-ID: <475a9394-c9ca-b549-1d2d-d6d49b08082d@amd.com>
Date:   Tue, 18 Apr 2023 22:16:45 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.10.0
Content-Language: en-CA
To:     Danilo Krummrich <dakr@redhat.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
References: <20230418100453.4433-1-dakr@redhat.com>
From:   Luben Tuikov <luben.tuikov@amd.com>
Subject: Re: [PATCH v2] drm/scheduler: set entity to NULL in
 drm_sched_entity_pop_job()
In-Reply-To: <20230418100453.4433-1-dakr@redhat.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZmlqQkh3cG5Md3RyVHhKbjFMaXIwWXJGM0dGRVlBQ0lTd2RBWFo1aHhtd2h2?=
 =?utf-8?B?MmZiUUFTVXBRTlY2NUVYelFkUnQwcDlQZ2Qxei9HaU5TRmJhLy95ZkR3ZmRQ?=
 =?utf-8?B?NUJhWWNiN1hKK0d4Rzc5ZU1Eb2VTbTJkN2xudGdsTUVSSWhXb1BzcHRMNDU1?=
 =?utf-8?B?UDZ1azN3d3JQRmpPTzBGbmdTYmpCWi9pajJaOTlGd3czaUZjWFl4UCs4U1Jk?=
 =?utf-8?B?NC9rS01PSDNiZ2MzTUkxVHVlMWhUdVV5Z1hUWFRVTjBwalZUb1Yvd28zQ2pm?=
 =?utf-8?B?NHZSeEtwejN2SnFqb3FIaGllRWhtU0htVC9NbDYwK0FFVWZmZEpjTURlV1lj?=
 =?utf-8?B?cTBneWVVemZRV21UdHVOL2dwSXVpb0RUcExEV3FxQy9QdlNpUFA1NkJtbCtv?=
 =?utf-8?B?dkc0bktCUStwdE1Ndmp4amVnMVBLcWpZS3hVcDJkUnp2Q3JOdHhoa253T1Fv?=
 =?utf-8?B?M3pkMWJHRWE3SEtKRmZpU3NTZEJQNGYxczUwY255ck5nMTNHaXVUc0FINUpJ?=
 =?utf-8?B?RFRORUdRbWt6WmpVRXdBYzRMY2xoQlhjQmVMNEhMa2J0WUgzNkJuTUhoRktE?=
 =?utf-8?B?V0FVSlBldGI4Q2F6bmVPV2U5MUI5cXNSd2llZmROWjV4aHVHcno5OG9rZGRk?=
 =?utf-8?B?RlBHMGVIb3E4ZTI0TFRzL3AwRE81RGVndGY3Mzl6VVVlSll4Mm5PcmNoQ3F2?=
 =?utf-8?B?eEVJK282TFY2WW5XYmYyZ05jT25FQmVGK0hQWXFHbjZTMmJ2N2x2aERDL2R0?=
 =?utf-8?B?VitIKzk4dE54aVh3eDFhazNtUDZQZWdGK1creHRsbCt0N1Jva2FtYVdYVVVv?=
 =?utf-8?B?OC9MUjI4N0ZNOEZpWXlNdXZsTDdhakFhZU55UWFSMFZVV0djSEJLMjNRaWdz?=
 =?utf-8?B?YXp3TnVLcEU2UzhpRTlaOFNFU01JamFnUUlaRlNFZE1yYmU3VnIxNmg4RWND?=
 =?utf-8?B?cVdhTnBHSndFUU1zYkY2UHBRbEtwaHV5TjcvcVpDZlVtbUtTOHJSZ0xna2VV?=
 =?utf-8?B?aDMyOFZvQzlYOTAweE96bEtrRHJPQTZoOUh2UEdBMEFwNFpCVmRQREFhK0du?=
 =?utf-8?B?UjVzSEZHQVZTUnJ6a0p3ZkZkTkpWc0FNMkViM1ZiWGRVaWNObGpZdmQ5Z2dn?=
 =?utf-8?B?UWVxU2VvSFVSWExCSHVMM1NmUHpLZmU4L2pudU10NU9hNDMydkMwcHFnZXh1?=
 =?utf-8?B?RE9pUC9za0RoU25Pd1I5TDV3aXdibjVPR0Z4RmFCUFhwK1NSa0VmRmpSMG0z?=
 =?utf-8?B?Rm1Pb1VmZmtBaXl3dG44R1lpbGZNZW9QMlF5OVZicngvWGx4cGZTWGhGYTFH?=
 =?utf-8?B?V2lydzgxNFFPWFFONVZsQjVDU05kY1VHL3F5VE9NeHoySEtkcWZtQlBuVURF?=
 =?utf-8?B?YzE5R2RsUGtWQk5taG56a2Q4OC9OMGVKU3YvTGlmUGZHZnNtQis5K2phOHQ4?=
 =?utf-8?B?ZDBKSVpYYjdtOTVkTEg0UG1DQzhQUEdZTXptY3FaN0orZTBSWVJyTUZRMjll?=
 =?utf-8?B?Ujk0cEdCUGdmdzdjeTB1Ky9NSVM3Ni9VaGJYb2R6WW9Nem14MTJnNXlqcmxq?=
 =?utf-8?B?TWE5Zzd1b2c2UUlER0ptVmpBSlBlM1YwakhzWFlSbkFsZm45R1NrWERmWkZh?=
 =?utf-8?B?VzduTjlhS2YrMlMvNW1HZFpoWVFLT3RtOE10RkovWTlPU2thUXdtdXBZMENU?=
 =?utf-8?B?MVNlNzVOdG1sQTJhMUZvSXY3ekU1eSs3OXdOUnBhaWpHR3FqN21SNzZmZGti?=
 =?utf-8?B?WlhxN2RyZkpYd08yaitqM0pnRnA1dVRjODFyUkdUQ0MrUDYyVTFOUmZ6M1NX?=
 =?utf-8?B?Wk9ockNIRXpIQTVzL01KMy8vUGNmT0hXSmpkNFZZRC9tNXlKaDh6d0U3dFB3?=
 =?utf-8?B?dGpqNjZjQjhOMHlKYlR3aENWdTFtNjNEbGxhQVJnbklZdWtjOXFvSnhkaThN?=
 =?utf-8?B?ZzFIeC9EMDd6Z1JvU3J6MHBTcHFLYVNPZ0s0QTFjQmhnUkljQlBTZ2F5dzdY?=
 =?utf-8?B?RWVFWGJyQVQzL0V4M2hCdURqU1lxcVFkMGg2Tk9HbWFRUkNGTGtvdjBCNGFM?=
 =?utf-8?B?ekk0dWNFeHZFS2hWa2d5bEl5dVdDbDNmcWs4dTcwcEJ1eVhmQW5CQlpPOVpE?=
 =?utf-8?Q?xtIJcvVsoWiLHGIVVCWQp2XmG?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1b591410-8819-47cb-15ec-08db407c20a2
X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB3370.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2023 02:16:47.7092
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: mvuYZOfhB8wf2goxjpShzuvmaMmKhbdennOLdaaww/QXkZ7C12CEPubSS/DJdDc2
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8023
X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>

and applied to drm-misc-next.

Thanks!

Regards,
Luben

On 2023-04-18 06:04, Danilo Krummrich wrote:
> 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 <dakr@redhat.com>
> ---
>  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 <linux/kthread.h>