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;
Date:   Wed, 24 Aug 2022 15:13:03 +0800
From:   joeyli <jlee@suse.com>
To:     "Rafael J. Wysocki" <rafael@kernel.org>
Cc:     "Lee, Chun-Yi" <joeyli.kernel@gmail.com>,
        Daniel Lezcano <daniel.lezcano@linaro.org>,
        Amit Kucheria <amitk@kernel.org>,
        Zhang Rui <rui.zhang@intel.com>,
        Linux PM <linux-pm@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] thermal/int340x_thermal: handle data_vault when the
 value is ZERO_SIZE_PTR
Message-ID: <20220824071303.GE5247@linux-l9pv.suse>
References: <20220808132158.24099-1-jlee@suse.com>
 <CAJZ5v0ig8mkNSrwsUhNVVGeBgB9TMmTDZQQmf_tCV4oJ85VPRA@mail.gmail.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAJZ5v0ig8mkNSrwsUhNVVGeBgB9TMmTDZQQmf_tCV4oJ85VPRA@mail.gmail.com>
User-Agent: Mutt/1.11.4 (2019-03-13)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yER+DvSLTXeVVDGj2Ey96QaNLz0vwwQJ9ZQKWIPMnyX5AnjAF4RsO5AcKTt5?=
 =?us-ascii?Q?CLQxPPaLyqea4jjdFpdTsLeVF4FdzDLWpBxS91ZPMZFJWpyfUq1k6GbqqJ38?=
 =?us-ascii?Q?wr5amGkoa6khbCyKYyMlvzmH8sMgqTwFhZbs03TizDKFaQqJupIkyUjn5/uE?=
 =?us-ascii?Q?EgN/pyaKFa57a7aTnETLGN0flF8Qa3OMu2IWP5h1vNXHPjs93XH0ArW6YivK?=
 =?us-ascii?Q?SI6OVMwb9BcH1kJvUooIYFJFOGRyKcMAk5vGHCZxZzyQW8nROL3u3GHaTp20?=
 =?us-ascii?Q?pjm8jzdxaHppRaL7Ih6aWkVF5Hme7UIK/5NES12hAh1jBOx2Tfqalyzy1DKc?=
 =?us-ascii?Q?o1gTMHYCkPy5gxW0pFDHiJUItG5U1anNxBo+4nhMmoqtZpFOZvmXnCWSAndj?=
 =?us-ascii?Q?L0BRF3fRqbEgGi3fgedwCpdGL1U2Q0nOwdsk1TxjElOtdOYirozqdl+FiIF7?=
 =?us-ascii?Q?6ozpVNtW3XSU2ZsCYOVuYzuMyOnH0oGkxFf0HV/5Z8JM7VLVUr2gMbHueV4d?=
 =?us-ascii?Q?UHNySMPJRejuh8X9t6ActoGSFzaGOsKR1TGa/7LvUHbXv+/WT+nDtm4ktvte?=
 =?us-ascii?Q?wCmMoGdzoYBw/DHvG5bq9w4cVj1NF1OyYL60DK/zu5x7SlLexExzHmbGTzv1?=
 =?us-ascii?Q?FPJd+5wZw+86vkQjeZwmMErM3MRYDqUu9i/YlaLRBp4T006VUqFm2pWn0UB8?=
 =?us-ascii?Q?q40xf4dpUyFAMbx0Ir/PNPdSK8fDSibB8d3gvjhUEOj6N6yGc6CO7Qpt+DU2?=
 =?us-ascii?Q?64ER9NgamWaRqDv2VPnzTc6rOv1klj52mPDtn/kfpazN03qZpZDCgKT9Gm78?=
 =?us-ascii?Q?Wju/VVMHjSUf2F6aXRaBFrSe19YCq4KajgrrHCWOtzomiJ/YAQVcfNHwCFRV?=
 =?us-ascii?Q?27tP9UhHrulZ7Ahn5sEzaWQSg99OgBPAOcncaWnNqZsN5yzZSym+1QqXzd7e?=
 =?us-ascii?Q?y2vOiaL1XFMnKJ4LOlxKVBqbTwXIpAQu9EbrTZLME2MnOu/b3FcgdN7CRNho?=
 =?us-ascii?Q?t4FsnnC+Nj9hbLP9PzWEag0ikKr01q4E1miFimN9YlMIThx8OyZlpAGjHGcC?=
 =?us-ascii?Q?bzc7QlcdrVL6us9VTfnTWkNgzlx6uCxIFOGSJ7QcwoLmKqbxtdGinuqb5OLv?=
 =?us-ascii?Q?LF31SbDfu2fdJPQxWrO5eY3FvR78U5DM2VxwY5oXeKASMBkGX11Yj//sDgmE?=
 =?us-ascii?Q?Bstav1JVyisZDgs6mFPVTooW+gWEkJupZIXWzl8ecCreldYhZjSfJRQ93QHK?=
 =?us-ascii?Q?6C6NhfrEWJp6bEd7EgkFgy19qk9hupy3xmOHLlI4UuAt/8UGmXaZfnrfjpnC?=
 =?us-ascii?Q?RQQRUac0qCSQ8lfj/oUOuXVj1BGYgVJhmIPkK0WAOtno5M26zPFvVYGHuMz5?=
 =?us-ascii?Q?rZ6lCmBa1Xi4oyTIV65jcha2V+8yD9Y/64pWPn/Xm/W7YTu7mN8LbsKGypnK?=
 =?us-ascii?Q?A2BENgVgXLnLkVETJaGScYnowfhiA/f0Z6EAqwY3OqpO01qjVU7R3PzlGcHt?=
 =?us-ascii?Q?2dvdxtsIieKJAhj+7cfG6NWBzYcd9djse1ZmcCSmoDniVzWT4Rj3Qvp1XFZ4?=
 =?us-ascii?Q?PuCmA6Xs2zwMQsSXOK+P+BNzBoz1aziIdM4CF2CaZbg68jqdB/KCvDLAuHxu?=
 =?us-ascii?Q?ZoSW9lFLGtOX9/rmqaO6V4OB43Kg0lHMmNYjZHc7hIs3?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8d5b5cba-e73b-4b7d-abef-08da85a01924
X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB7164.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2022 07:13:09.1003
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CLYu6ElbFaqjidFNUSLWZc6FV4pkX2bIfSEsB/QbonDM3/w8Ob7lXB/NC117XyMs
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5476
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,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

On Tue, Aug 23, 2022 at 07:53:18PM +0200, Rafael J. Wysocki wrote:
> On Mon, Aug 8, 2022 at 3:22 PM Lee, Chun-Yi <joeyli.kernel@gmail.com> wrote:
> >
> > In some case, the GDDV returns a package with a buffer which has
> > zero length. It causes that kmemdup() returns ZERO_SIZE_PTR (0x10).
> >
> > Then the data_vault_read() got NULL point dereference problem when
> > accessing the 0x10 value in data_vault.
> >
> > [   71.024560] BUG: kernel NULL pointer dereference, address:
> > 0000000000000010
> >
> > This patch uses ZERO_OR_NULL_PTR() for checking ZERO_SIZE_PTR or
> > NULL value in data_vault.
> >
> > Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
> 
> Applied as 6.0-rc material, thanks!

Thanks for Rafael's help!

Joey Lee

> 
> > ---
> >  drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 9 +++++----
> >  1 file changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> > index 80d4e0676083..365489bf4b8c 100644
> > --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> > +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> > @@ -527,7 +527,7 @@ static void int3400_setup_gddv(struct int3400_thermal_priv *priv)
> >         priv->data_vault = kmemdup(obj->package.elements[0].buffer.pointer,
> >                                    obj->package.elements[0].buffer.length,
> >                                    GFP_KERNEL);
> > -       if (!priv->data_vault)
> > +       if (ZERO_OR_NULL_PTR(priv->data_vault))
> >                 goto out_free;
> >
> >         bin_attr_data_vault.private = priv->data_vault;
> > @@ -597,7 +597,7 @@ static int int3400_thermal_probe(struct platform_device *pdev)
> >                         goto free_imok;
> >         }
> >
> > -       if (priv->data_vault) {
> > +       if (!ZERO_OR_NULL_PTR(priv->data_vault)) {
> >                 result = sysfs_create_group(&pdev->dev.kobj,
> >                                             &data_attribute_group);
> >                 if (result)
> > @@ -615,7 +615,8 @@ static int int3400_thermal_probe(struct platform_device *pdev)
> >  free_sysfs:
> >         cleanup_odvp(priv);
> >         if (priv->data_vault) {
> > -               sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group);
> > +               if (!ZERO_OR_NULL_PTR(priv->data_vault))
> > +                       sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group);
> >                 kfree(priv->data_vault);
> >         }
> >  free_uuid:
> > @@ -647,7 +648,7 @@ static int int3400_thermal_remove(struct platform_device *pdev)
> >         if (!priv->rel_misc_dev_res)
> >                 acpi_thermal_rel_misc_device_remove(priv->adev->handle);
> >
> > -       if (priv->data_vault)
> > +       if (!ZERO_OR_NULL_PTR(priv->data_vault))
> >                 sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group);
> >         sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group);
> >         sysfs_remove_group(&pdev->dev.kobj, &imok_attribute_group);
> > --
> > 2.26.2
> >