From patchwork Wed Dec 6 14:37:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 174605 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4147607vqy; Wed, 6 Dec 2023 06:37:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IFyocKbz5C+fXXRPDBENLsArZgY4jqsdiGw/542BSliVosPQ/YL4F14++nxRveLm4ZF+H+v X-Received: by 2002:a17:90a:41:b0:286:6cc1:3efe with SMTP id 1-20020a17090a004100b002866cc13efemr937044pjb.53.1701873465674; Wed, 06 Dec 2023 06:37:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701873465; cv=none; d=google.com; s=arc-20160816; b=D9ecMCcHcv98+whIu+oahRxXhAoZFrrggV+ouERpdaCK90mnw4otnfbfdxhn7KSv1O L1uTKJ1Cs8vPeP/2IdYOEonRIl/P5ANegVFtYkmQV56Sx3SikAS1dnjkOmSYhFJB9rwI qMFdvUpDmCwlQh3JHncaLly5zY0iMYoPUdf8OxEA6za880jZ2gOyr2d64LfwS7/4afID AT3NTY8nKPTeYV2oCfNyBOS/pgWYwg6gnEYSSR2/tzKcAZIQR6NmPlFZn6zvQguiCFh9 j2RQgk8MMI3FvSz/bz9S9K5RWY/ssckpVii8zwsyj8IpGjUPc9jjRQIyfBmTH4oEjLrO hnXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=VW3Q3pYivZ0nqLu9afJmoH7SdepQ5nT0zPYa9KiyjuA=; fh=clRUi21q+hzqhGypZ+0Bp2l9VrQmuH0Bsam8f4JD868=; b=CoKc87StS5cdpkS+lAQiIBxzcS+OA668pvoe/8CcC8ptOopntNSB3gFwtbnHeDdlDw w5/VAVXRYoDCuoz3BDs/cXqcwD8+gdTTMcRHx7xuUjE/MtsgF/MLAdeob2ckUQt2ghZt qH8nz40VDyvP4bUlcXSkRk6ZOq7awGDJCVjjLMe4MCxZ/A+SjAvQ7dsaXShxC1XhJ3pd 6jt3vbDQ84I0UWhTRSysRLla9VWhz2/KJ00dYGlEYjU9gDL1XYramzDi92rB6rRT3UMh DODzv/cYVir720BpZdK85lR8Pjah0mCUv6+mDrk1MH+uwEg70IU33qOGKv1Rtx6unaDQ mb0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="rtj/Jkfc"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id b3-20020a17090a800300b0028644ca706dsi11093966pjn.171.2023.12.06.06.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 06:37:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="rtj/Jkfc"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 551BD8093CBB; Wed, 6 Dec 2023 06:37:43 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378941AbjLFOhZ (ORCPT + 99 others); Wed, 6 Dec 2023 09:37:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378870AbjLFOhX (ORCPT ); Wed, 6 Dec 2023 09:37:23 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05317D40 for ; Wed, 6 Dec 2023 06:37:30 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3333a3a599fso473667f8f.0 for ; Wed, 06 Dec 2023 06:37:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701873448; x=1702478248; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=VW3Q3pYivZ0nqLu9afJmoH7SdepQ5nT0zPYa9KiyjuA=; b=rtj/JkfcEE84dqHxkBKomp1ycakWlsQRrhgUqH3GQY0T07ZsCAsPOSKxSl+Qyf1Mya zRVXmdfYqMZq5wIgUhFJyQHCSb25QWPliz5+EiaxXmDUGdOMEfPwq4APYJGF4Nw5Rw1m b+dzqAOlBAJqnVAu0uB5nrIqaLI+wAYOCRIbofJe+MiPFS/xtOAbhBv0GTkILE0lPIKd wZeSVsNlR3q4JSZrF+xSUJGZuH3IdrcgisEa8EiMxdPHxllFCn21FzrA0ZxEZoZX8nAN qb/kB0+04d4GlWPotK69WIZn0G2A5t8U5cymMpb2SHQWvKKGnj3OuO0PPdsVN1ys68bq uDFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701873448; x=1702478248; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VW3Q3pYivZ0nqLu9afJmoH7SdepQ5nT0zPYa9KiyjuA=; b=cn7JqCVmGjjqwT8Kie18JjOxv8wAz06xeuWkDYBLcHZXyK/74Zx6yETkMSyuGkRHLz 3iknBrxVLkRpVDHydDR8/onKUBPAsYkx9UswfKz0SuMtLAwYpjQ1a8OtTaZzpgZOqFNX FssCLxbIOebfygMNTYC8E1p3w3fNBOHeSggJ0tHAN9jUCCI2baH0mdgparFbW90n7FbJ MxEsg81Y+ilgln1RIf4zhPwKyE+Tv9c0BgB7bbs3TL+lfULsNpgxZK88bXLIBzIllAfz DP7jJFcgABmjfqvTCG0nBpEuoRb/ASVTEksGaC1zVz2G5DR92xCVHDOIegg0tnjpr/eK G+uA== X-Gm-Message-State: AOJu0Yz6JZN8ScrK5nStAIGBRJC8IUgjNvBK0rsgXcFEptGSQy99y540 B2XpfBUrZYuY/taRKtYyG10V0vtQb89fXVNlx5g= X-Received: by 2002:a05:600c:4e90:b0:40b:5e56:7b68 with SMTP id f16-20020a05600c4e9000b0040b5e567b68mr1640147wmq.177.1701873448401; Wed, 06 Dec 2023 06:37:28 -0800 (PST) Received: from localhost ([102.36.222.112]) by smtp.gmail.com with ESMTPSA id fa10-20020a05600c518a00b00405442edc69sm25776814wmb.14.2023.12.06.06.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 06:37:27 -0800 (PST) Date: Wed, 6 Dec 2023 17:37:24 +0300 From: Dan Carpenter To: Donald Robson Cc: Frank Binns , Matt Coster , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Sarah Walker , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] drm/imagination: Move dereference after NULL check in pvr_mmu_backing_page_init() Message-ID: <13f4278e-af9c-4092-9196-bc0e6b76f1eb@moroto.mountain> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 agentk.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 (agentk.vger.email [0.0.0.0]); Wed, 06 Dec 2023 06:37:43 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784543671202572565 X-GMAIL-MSGID: 1784543671202572565 This code dereferences "page->pvr_dev" and then checked for NULL on the next line. Re-order it to avoid a potential NULL pointer dereference. Fixes: ff5f643de0bf ("drm/imagination: Add GEM and VM related code") Signed-off-by: Dan Carpenter Reviewed-by: Frank Binns --- drivers/gpu/drm/imagination/pvr_mmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imagination/pvr_mmu.c b/drivers/gpu/drm/imagination/pvr_mmu.c index c8562bfc0dcd..4fe70610ed94 100644 --- a/drivers/gpu/drm/imagination/pvr_mmu.c +++ b/drivers/gpu/drm/imagination/pvr_mmu.c @@ -316,12 +316,14 @@ pvr_mmu_backing_page_init(struct pvr_mmu_backing_page *page, static void pvr_mmu_backing_page_fini(struct pvr_mmu_backing_page *page) { - struct device *dev = from_pvr_device(page->pvr_dev)->dev; + struct device *dev; /* Do nothing if no allocation is present. */ if (!page->pvr_dev) return; + dev = from_pvr_device(page->pvr_dev)->dev; + dma_unmap_page(dev, page->dma_addr, PVR_MMU_BACKING_PAGE_SIZE, DMA_TO_DEVICE);