From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80EC8C433DB for ; Fri, 5 Feb 2021 06:42:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C4AE64F9B for ; Fri, 5 Feb 2021 06:42:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231169AbhBEGmQ (ORCPT ); Fri, 5 Feb 2021 01:42:16 -0500 Received: from mail29.static.mailgun.info ([104.130.122.29]:61752 "EHLO mail29.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230527AbhBEGmO (ORCPT ); Fri, 5 Feb 2021 01:42:14 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1612507309; h=Content-Transfer-Encoding: Content-Type: In-Reply-To: MIME-Version: Date: Message-ID: From: References: Cc: To: Subject: Sender; bh=Pq6SFpYB7bZzneOPuiPx50qEYnSet0KQsUNB8GY6yTU=; b=OCXukF3MSxpQaAuW6qsFznO7xGIFY/BZYnR07avvahx9QuoqTAQfvu7n7/IxtBaS9tN/Ei53 Aw7GuIcZ4PPMHpV6j0pb5cvlcPkzHFK4uIC8A7hOxAYdnmNDPbJSfOOPGtbzn4bvSasMiwMn k5BQHKLeyq3T888nPIdBYDYJHBk= X-Mailgun-Sending-Ip: 104.130.122.29 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n05.prod.us-east-1.postgun.com with SMTP id 601ce8900bb8f50fb9918826 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Fri, 05 Feb 2021 06:41:20 GMT Sender: akhilpo=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 551BAC43462; Fri, 5 Feb 2021 06:41:19 +0000 (UTC) Received: from [192.168.1.105] (unknown [61.1.238.129]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: akhilpo) by smtp.codeaurora.org (Postfix) with ESMTPSA id 59B2AC433CA; Fri, 5 Feb 2021 06:41:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 59B2AC433CA Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=akhilpo@codeaurora.org Subject: Re: [PATCH] drm/msm: Fix legacy relocs path To: Rob Clark , dri-devel@lists.freedesktop.org Cc: Rob Clark , "open list:DRM DRIVER FOR MSM ADRENO GPU" , David Airlie , "open list:DRM DRIVER FOR MSM ADRENO GPU" , open list , "Kristian H. Kristensen" , Sean Paul , Emil Velikov References: <20210204225650.1284384-1-robdclark@gmail.com> From: Akhil P Oommen Message-ID: Date: Fri, 5 Feb 2021 12:11:10 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <20210204225650.1284384-1-robdclark@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/5/2021 4:26 AM, Rob Clark wrote: > From: Rob Clark > > In moving code around, we ended up using the same pointer to > copy_from_user() the relocs tables as we used for the cmd table > entry, which is clearly not right. This went unnoticed because > modern mesa on non-ancent kernels does not actually use relocs. > But this broke ancient mesa on modern kernels. > > Reported-by: Emil Velikov > Fixes: 20224d715a88 ("drm/msm/submit: Move copy_from_user ahead of locking bos") > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/msm_gem_submit.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c > index d04c349d8112..5480852bdeda 100644 > --- a/drivers/gpu/drm/msm/msm_gem_submit.c > +++ b/drivers/gpu/drm/msm/msm_gem_submit.c > @@ -198,6 +198,8 @@ static int submit_lookup_cmds(struct msm_gem_submit *submit, > submit->cmd[i].idx = submit_cmd.submit_idx; > submit->cmd[i].nr_relocs = submit_cmd.nr_relocs; > > + userptr = u64_to_user_ptr(submit_cmd.relocs); > + > sz = array_size(submit_cmd.nr_relocs, > sizeof(struct drm_msm_gem_submit_reloc)); > /* check for overflow: */ > Reviewed-by: Akhil P Oommen -Akhil.