From patchwork Wed Feb 15 23:50:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 57769 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp6517wrn; Wed, 15 Feb 2023 16:07:09 -0800 (PST) X-Google-Smtp-Source: AK7set9Ezol01hPenKGflUQrsaAuqRzrObvoO14ybSOBvCKVNYTspltAhPHm2I2FPH1Nu1O5vJZW X-Received: by 2002:a17:907:3e29:b0:8b1:2614:edfe with SMTP id hp41-20020a1709073e2900b008b12614edfemr482718ejc.9.1676506029579; Wed, 15 Feb 2023 16:07:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676506029; cv=none; d=google.com; s=arc-20160816; b=JJ0azYkBShv8n9FLIGz/d2Sw9f+epy9f4lE39w6DlVBvhWVbHB6ZJrXMk49dWvP/ym vatjuGHJo1mSH8dCx3U1hn0ORH2R6sK1nqZck1q2YCz1ZmWAefsMXiE4AAIPuyi2/0k+ aWQuLSalY1PgYrUTfxjuY0K+3BXg/JK73PEgDUSpK7BDNBER38+sTkkpu+iOwROi7YAe 7j2nCm337ePlwAjUvb74Kje1nB/kLbYbbWb5FOA7/UppBLWX1I9zy0LwisGkC1CXvl80 fYtahz2SPd0fk1jxIJvJZExr5yhZ5ywq4Wz9Li4LNqCaM6X034QmUdPx7e0LKiDSClTV r/TA== 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=zeIoX4RDWl3f+nhG+Pkar8Woaq/FoxjOB1t6jgPazJQ=; b=FxcuF8UGGAxJjfYSzlXMVlndBRTvR+MK7UhjXEH6qowv1lMnxHycXD6oAYDvWgj1qd P0UNHGo5PYdCmIFnyEoD2XRLWX2HhXK55TOe+e8d9NqwpCTf9Z/1vH/U7fcb6Ot+z2Ke 1Rew7t5/6sIreyrh0b8jgkO5qSaZ+2XMCc+xqQDk9dpewx11o4coFpAbFYAGY/mWNa14 HWfX2nZqONNg6mQ7jFuzGVWmLglvPsvAcbKSWCwnyXo/BigZjpPzP0QRH05NzNiX9pFs IolKYZnkIg2yYDwxEbLUXf+DPBXFI4w5v6R6XoeTrCxxgz9pECm+5DA+z8VEqw/yD3v8 to5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=l5qD+x9N; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id wg11-20020a1709078f0b00b0088ce3b14b8dsi136391ejc.98.2023.02.15.16.06.08; Wed, 15 Feb 2023 16:07:09 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=l5qD+x9N; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229660AbjBOXue (ORCPT + 99 others); Wed, 15 Feb 2023 18:50:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbjBOXud (ORCPT ); Wed, 15 Feb 2023 18:50:33 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E6A92ED45; Wed, 15 Feb 2023 15:50:32 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id r3so363428pfh.4; Wed, 15 Feb 2023 15:50:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zeIoX4RDWl3f+nhG+Pkar8Woaq/FoxjOB1t6jgPazJQ=; b=l5qD+x9Nq6Q8eFXBnLD2JP5DpZJ5D0HO0afceUtRjxa8Z+s7yb/ay9AlicklsmlEEw 3e4Rj36HY8jLFGQGubTa5jW8tNGAI0hR46V9Chl+bP0tALpancQEy8IHLrrcSKDtjIg2 kd6Llo+VeClFPVTTcEKTtD2bMvCfInlONN/36JtjfpQbZ7BwFlCJCIR4rPy2hYbwUsZK zHBOTJlZm2GcXslUCSf4XusKH4awMsXWYun5YQ8smTpEXzovscwAWdc6PYw8DLjWoLIs aezpJuj+RbLreYYAy63wF/LsmoxdyWkKskghzUhBMuKDs2ueRq7s1huiAayMldfdHjZw N9ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=zeIoX4RDWl3f+nhG+Pkar8Woaq/FoxjOB1t6jgPazJQ=; b=MLiU+8cjJoGqN7b7gBfX33RrBVYQQyQdXBy/5aL0k/i+eeg/8nJ2mWBdNJVlePEAyO m7gLQPYTmoDOrxAHdBleubqcsRA30GnaEEYmcWIZbEHOFKvnkbnnKL5o+LDIlhkwlXQy I+2/GNAtsW2MO2wxrYegJUiFAPaSIopFKhurNNASEzONhmcCKML2RGzTBxui6mIJ6jyS jUeTDyVv1fky9T0DWRlOui61OfRvF8RwLM+a0zOQDAJINRHl7Nydbq2h3B6gAnlmNDn3 lCPo9jOQlREpU3Eiq0zkd0E0ZzSAKazukp9Zvm5UrWcJNKcRVE8jSn4yQoGvmAf2bdSh /XjQ== X-Gm-Message-State: AO0yUKUaF3fp7PwrsOU3YVBOSd9WrU6a/ibiC9iuQcWlkOGHIYCgQ9X0 YXcHaMiuLvr2ceCbevqN98Ve26p93S4= X-Received: by 2002:aa7:973d:0:b0:5a8:be36:65a8 with SMTP id k29-20020aa7973d000000b005a8be3665a8mr3307802pfg.27.1676505031706; Wed, 15 Feb 2023 15:50:31 -0800 (PST) Received: from localhost ([2a00:79e1:abd:4a00:2703:3c72:eb1a:cffd]) by smtp.gmail.com with ESMTPSA id j14-20020aa7928e000000b0058d8db0e4adsm12628278pfa.171.2023.02.15.15.50.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 15:50:31 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Rob Clark , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Bas Nieuwenhuizen , Jordan Crouse , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] drm/msm: Fix potential invalid ptr free Date: Wed, 15 Feb 2023 15:50:48 -0800 Message-Id: <20230215235048.1166484-1-robdclark@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757943986385361849?= X-GMAIL-MSGID: =?utf-8?q?1757943986385361849?= From: Rob Clark The error path cleanup expects that chain and syncobj are either NULL or valid pointers. But post_deps was not allocated with __GFP_ZERO. Fixes: ab723b7a992a ("drm/msm: Add syncobj support.") Signed-off-by: Rob Clark Reviewed-by: Dmitry Baryshkov Reviewed-by: Dmitry Osipenko --- drivers/gpu/drm/msm/msm_gem_submit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c index 6503220e5a4b..e4d13540300e 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -640,8 +640,8 @@ static struct msm_submit_post_dep *msm_parse_post_deps(struct drm_device *dev, int ret = 0; uint32_t i, j; - post_deps = kmalloc_array(nr_syncobjs, sizeof(*post_deps), - GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY); + post_deps = kcalloc(nr_syncobjs, sizeof(*post_deps), + GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY); if (!post_deps) return ERR_PTR(-ENOMEM); @@ -656,7 +656,6 @@ static struct msm_submit_post_dep *msm_parse_post_deps(struct drm_device *dev, } post_deps[i].point = syncobj_desc.point; - post_deps[i].chain = NULL; if (syncobj_desc.flags) { ret = -EINVAL;