Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp4354657ioa; Wed, 27 Apr 2022 01:44:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHvQngBFcbziVkMEpEZm81IfZV0Sg5ZF7RFXXmnOYxtSvCNOdGCbMj9WgjbsdZN+ZOA5HZ X-Received: by 2002:a17:90a:4f0b:b0:1d9:acbd:1204 with SMTP id p11-20020a17090a4f0b00b001d9acbd1204mr8787158pjh.201.1651049059353; Wed, 27 Apr 2022 01:44:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651049059; cv=none; d=google.com; s=arc-20160816; b=Lmq5hcsdSpoIvNbbFSGLw+erenoyv/msSqC7xmYhEjDouXmdoSSSnkJcfEF0JOtofd jzwohT9q2BWlAy8HNSSo7H+Gt1nYLc6TdAqK1VMoB9pfKxZKqzM3BQALmHraevr0shSe vvpyRYmipdz8yeH41aS27wBboMwlGhYs9md5e5UvtdgtNpsJHj9gaxVvMym7MUHwespI V7zKqb3PTQMhfXdr9CeNjCkAgKkelwG2vSwuBnood8ECfQDW2OYRWHZd0q509PukCE16 xEFqI+NSDGy1G3+X3Uf3mO9rfqlf78FszbR1PxwQ/fSo/jmhwH6JFqUlfzLC45DfC3SY V06w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HMImENnLI9PrWHYny20jyIIlBmrzno1cgzKk3yeZwWo=; b=R5268jAgqsZ7An+fH92hmgFl7LgDYYLpeop8pfRxk+3M2UPDOBJFfBNA6xYsyKG7O0 nHqB27dwOEEL+WGzhUnypKncJTDwPn1TrOpcUGrwVqte12BgrFAuwAgqGQY3PhiRRNRT tHXQkLFvZzL3z9Tk5JN3wEsxdpfph4lMGmlpVQt5f/CSFM47orS9XHlwSbxKfHQnoZLr fBy/mstTzZ+MOhf7EbK44SrQNeXb/65nQRvm1OL+NlB/chxF3Iwzkr9enR2cBgZ9U4jg D3O10htILRqAyzhOaeBI2cXb1bBrI0k0faw7Xz/KapQ3n2Izll23N0oZfWvEjt4SGylh mqNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RvzUGZVs; 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=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g21-20020a056a000b9500b0050a96ba4e5esi876201pfj.290.2022.04.27.01.44.05; Wed, 27 Apr 2022 01:44:19 -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=@linuxfoundation.org header.s=korg header.b=RvzUGZVs; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346498AbiDZJEc (ORCPT + 99 others); Tue, 26 Apr 2022 05:04:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346793AbiDZIpW (ORCPT ); Tue, 26 Apr 2022 04:45:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B0013B3E8; Tue, 26 Apr 2022 01:35:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1882F61899; Tue, 26 Apr 2022 08:35:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 094F6C385A4; Tue, 26 Apr 2022 08:35:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1650962139; bh=904Yeuvzqm23g7s+sAX4Ms24/YBBVjFmcCiyB/hFFGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RvzUGZVsoN8NML6JTYW5UEoe9K4wHXWNhvo+Z8TSc4/PdkeXzA4F5cP7AjYWPxPHA /IjNy4cujGZbjU2N4rgGF7+Pnvc6sHbpOqm1Ioyc5uUBKW1v09q0m/nH68w8/5AmNZ I+QzxucziwzwcLswqWrW2zAxuCEvjNmmq52uMpEk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiaoke Wang , Dmitry Baryshkov , Rob Clark , Sasha Levin Subject: [PATCH 5.10 45/86] drm/msm/mdp5: check the return of kzalloc() Date: Tue, 26 Apr 2022 10:21:13 +0200 Message-Id: <20220426081742.505980767@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220426081741.202366502@linuxfoundation.org> References: <20220426081741.202366502@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 From: Xiaoke Wang [ Upstream commit 047ae665577776b7feb11bd4f81f46627cff95e7 ] kzalloc() is a memory allocation function which can return NULL when some internal memory errors happen. So it is better to check it to prevent potential wrong memory access. Besides, since mdp5_plane_reset() is void type, so we should better set `plane-state` to NULL after releasing it. Signed-off-by: Xiaoke Wang Reviewed-by: Dmitry Baryshkov Patchwork: https://patchwork.freedesktop.org/patch/481055/ Link: https://lore.kernel.org/r/tencent_8E2A1C78140EE1784AB2FF4B2088CC0AB908@qq.com Signed-off-by: Dmitry Baryshkov Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c index 83423092de2f..da0799333970 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c @@ -179,7 +179,10 @@ static void mdp5_plane_reset(struct drm_plane *plane) drm_framebuffer_put(plane->state->fb); kfree(to_mdp5_plane_state(plane->state)); + plane->state = NULL; mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL); + if (!mdp5_state) + return; /* assign default blend parameters */ mdp5_state->alpha = 255; -- 2.35.1