From patchwork Sat Jan 19 16:04:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangtao Li X-Patchwork-Id: 10772079 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A076E13B4 for ; Sat, 19 Jan 2019 16:05:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81F792D20C for ; Sat, 19 Jan 2019 16:05:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74C0E2D219; Sat, 19 Jan 2019 16:05:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 118392D20C for ; Sat, 19 Jan 2019 16:05:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728345AbfASQE7 (ORCPT ); Sat, 19 Jan 2019 11:04:59 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:46540 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728312AbfASQE7 (ORCPT ); Sat, 19 Jan 2019 11:04:59 -0500 Received: by mail-pl1-f195.google.com with SMTP id t13so7705217ply.13; Sat, 19 Jan 2019 08:04:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=bk6YHkrN79KBpYNbpyXdgU6SAl9H9FvkZ8RPpWBaXoc=; b=cHURv9bRxV5tw6yiYEZVDPyXgY8/D1JnFN5o2x1izlHLVatjhcHNRDzovkBMeAWn3C RTN5voEfFW2cSYGAKNu5l2ZU7ZmxR5E/Bl63+4gFmBfp7gzF5AyD9WFh1RiavD452KXm bEDch521E5/DKkPD4MLq38nbuySbNiyqHeJ4JxWuLBpHb4J5hvaLpfmo7Z9Rs+VSBwOq 1St3jArvHLaeUpZTSPNFELEMa4x/4xxHQ9baGwlXP+RsAEC8bBmPMV0nJUMx8A+W0qkA lz7aWYlGpDCahoYj2qao6tR2FwTYNcsbQrclrRTXz9yeQo4th9qtTbj5Kp8FEFP4OnPX 4g1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=bk6YHkrN79KBpYNbpyXdgU6SAl9H9FvkZ8RPpWBaXoc=; b=qS+MFbBL07hs4fChOQNOugMs2GILtsMLKWyiFpAbWd2Ro7hTLayOYlXp2kziWpaOC6 uVrvXGgjfVW33IxzBIFpWYNp2uDW0YLbkGcmZnF6ASn3mhxnCJ2kHqkT1W41kaaI8Vdq FfOoppquVR5QbQch0GavZqPHLUnJ5E/dwlRhUGJ9xY6W8I73ipeU7dqoetYYgMh/ECCN KyUA7AX8nIFxALfSS0srXLqjSw/RlTHnGEvjctCI3v0ZsPSKKyonyp+1zwUIruagz7gI GbfqfG8TwjvRzVzisbuF5Hf6L8rSyzQ750xIc1bJFTzN0xqNk5tOP1MAPRzEWZPwrS/f iFYA== X-Gm-Message-State: AJcUukdeanCNfTunDyg42dydlvLn/GzWKxK4k95KXZGH8/RrAx+LhEBo YnjOuFf9oisyYbV+lR3ULBPvP3W++Mg= X-Google-Smtp-Source: ALg8bN5/v1jCf1u0G83SGMUAYE/quYBbHY6Kz53/VsPjL7IM41c4La1qm0zOqWO4HAzfzwYI+/+vOA== X-Received: by 2002:a17:902:bf44:: with SMTP id u4mr23585839pls.5.1547913898261; Sat, 19 Jan 2019 08:04:58 -0800 (PST) Received: from localhost (68.168.130.77.16clouds.com. [68.168.130.77]) by smtp.gmail.com with ESMTPSA id q1sm10908798pfb.96.2019.01.19.08.04.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 08:04:57 -0800 (PST) From: Yangtao Li To: myungjoo.ham@samsung.com, kyungmin.park@samsung.com, cw00.choi@samsung.com, linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Yangtao Li Subject: [PATCH 1/3] PM / devfreq: fix indentation in devfreq_add_device() Date: Sat, 19 Jan 2019 11:04:52 -0500 Message-Id: <20190119160454.23151-1-tiny.windzz@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To beautify the code format. Signed-off-by: Yangtao Li Reviewed-by: Chanwoo Choi --- drivers/devfreq/devfreq.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 0ae3de76833b..076b1c2f40a4 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -683,16 +683,15 @@ struct devfreq *devfreq_add_device(struct device *dev, goto err_out; } - devfreq->trans_table = - devm_kzalloc(&devfreq->dev, - array3_size(sizeof(unsigned int), - devfreq->profile->max_state, - devfreq->profile->max_state), - GFP_KERNEL); + devfreq->trans_table = devm_kzalloc(&devfreq->dev, + array3_size(sizeof(unsigned int), + devfreq->profile->max_state, + devfreq->profile->max_state), + GFP_KERNEL); devfreq->time_in_state = devm_kcalloc(&devfreq->dev, - devfreq->profile->max_state, - sizeof(unsigned long), - GFP_KERNEL); + devfreq->profile->max_state, + sizeof(unsigned long), + GFP_KERNEL); devfreq->last_stat_updated = jiffies; srcu_init_notifier_head(&devfreq->transition_notifier_list); From patchwork Sat Jan 19 16:04:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangtao Li X-Patchwork-Id: 10772081 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F2C76C5 for ; Sat, 19 Jan 2019 16:05:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BCD82D20C for ; Sat, 19 Jan 2019 16:05:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C0742D21C; Sat, 19 Jan 2019 16:05:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFA162D20C for ; Sat, 19 Jan 2019 16:05:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728461AbfASQFD (ORCPT ); Sat, 19 Jan 2019 11:05:03 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:41268 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728312AbfASQFD (ORCPT ); Sat, 19 Jan 2019 11:05:03 -0500 Received: by mail-pf1-f195.google.com with SMTP id b7so8081808pfi.8; Sat, 19 Jan 2019 08:05:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HhgKdS56P2I78qNU/oYmWmiGlWeN03CHUf47z15UwlQ=; b=AwyJrhRcycp3KuhCxqymWMWG4P/3y7ES2et1N/KSI7Q6acV3/v86UsWf0q7dPc9oqK h/t8Hkf/rKOvHlFC8u57RCEvdAf4N+FhIxxkc3dQCZdzKkGnUzL46j2Khiuk1htCq5Nz XyX586/6fqX1GkXGMd9UxAaWZryHkAl7L/kqIkAanli2luotXH3rnV+ECAWjOzv248JE UITSxcB50ablV5ifPYHPHTkc1aHuZoK61elryoXAebL2iV9mPeLj+nNvJ5CEgnJZ6rku yiN+lTQVH0NGNeUMLanN0Uj0Tth+t63oAJaIjjOEBphbSV/1IOuP23bZ1eW50ku04XBM +Brg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HhgKdS56P2I78qNU/oYmWmiGlWeN03CHUf47z15UwlQ=; b=HAAfmbYzVCX1TGWw/6XHRVxtVuMOANSCuYpFhx08K9w/MeznrHkxNIH8AavUX/vJln CDbRUy33ig1exFXTy1ZqukSG7YkG01PHscUGvcyZgQWehCbSEhBTyAHxY0pCENTpMQEE 42ZHcMFtbQs/E12U/6rb7uXVIAOLMgDOZPLsp0Mo5+bc+bqhX8NPESMiBEb+MUJjT0T8 tC0kS0xlV7jHR2lyIh9s0vc+l+6l40KHvxjkLwDibOrLWZdn/2OQxEZIqmPbchsoXxvy OiFQS9NSwrLuYmlVKNF6S6VAmNyGQgNtbNkrZTE6qEm81WtOHDYHqA+o6ImtQ5SuD7TG 89oA== X-Gm-Message-State: AJcUukdVQQraGGNA3RjxHRy65D3/RbozvEe4ZlOL+Zf+Tj7lCeXvg2Jh /daBJEv9QKZ2n2I4x7UJ54U= X-Google-Smtp-Source: ALg8bN4hcF2k73qHmyD9Xg/fa1MNSQwFmyuViDni0ZxlQdY0JLtf9cvTC/cnLHGOM8MVhKDmiqOX7g== X-Received: by 2002:a63:1321:: with SMTP id i33mr22322084pgl.380.1547913902761; Sat, 19 Jan 2019 08:05:02 -0800 (PST) Received: from localhost (68.168.130.77.16clouds.com. [68.168.130.77]) by smtp.gmail.com with ESMTPSA id e187sm10850686pfa.130.2019.01.19.08.05.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 08:05:01 -0800 (PST) From: Yangtao Li To: myungjoo.ham@samsung.com, kyungmin.park@samsung.com, cw00.choi@samsung.com, linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Yangtao Li Subject: [PATCH 2/3] PM / devfreq: fix missing check of return value in devfreq_add_device() Date: Sat, 19 Jan 2019 11:04:53 -0500 Message-Id: <20190119160454.23151-2-tiny.windzz@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190119160454.23151-1-tiny.windzz@gmail.com> References: <20190119160454.23151-1-tiny.windzz@gmail.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP devm_kzalloc() could fail, so insert a check of its return value. And if it fails, returns -ENOMEM. Signed-off-by: Yangtao Li Acked-by: MyungJoo Ham --- drivers/devfreq/devfreq.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 076b1c2f40a4..923889229a0b 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -688,10 +688,22 @@ struct devfreq *devfreq_add_device(struct device *dev, devfreq->profile->max_state, devfreq->profile->max_state), GFP_KERNEL); + if (!devfreq->trans_table) { + mutex_unlock(&devfreq->lock); + err = -ENOMEM; + goto err_devfreq; + } + devfreq->time_in_state = devm_kcalloc(&devfreq->dev, devfreq->profile->max_state, sizeof(unsigned long), GFP_KERNEL); + if (!devfreq->time_in_state) { + mutex_unlock(&devfreq->lock); + err = -ENOMEM; + goto err_devfreq; + } + devfreq->last_stat_updated = jiffies; srcu_init_notifier_head(&devfreq->transition_notifier_list); @@ -725,7 +737,7 @@ struct devfreq *devfreq_add_device(struct device *dev, err_init: mutex_unlock(&devfreq_list_lock); - +err_devfreq: devfreq_remove_device(devfreq); devfreq = NULL; err_dev: From patchwork Sat Jan 19 16:04:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangtao Li X-Patchwork-Id: 10772083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F27F13B4 for ; Sat, 19 Jan 2019 16:05:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EB8A2D20C for ; Sat, 19 Jan 2019 16:05:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51EB52D219; Sat, 19 Jan 2019 16:05:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0A152D210 for ; Sat, 19 Jan 2019 16:05:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728312AbfASQFH (ORCPT ); Sat, 19 Jan 2019 11:05:07 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:36982 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728590AbfASQFG (ORCPT ); Sat, 19 Jan 2019 11:05:06 -0500 Received: by mail-pf1-f194.google.com with SMTP id y126so8098545pfb.4; Sat, 19 Jan 2019 08:05:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=igiS7JY9Tkj0t+DmCwo3tZOgXVjRsJpaBhsfH2U83Tk=; b=Spm1FEZb+BK5b0ThVBclsti0DUS08YWPw4T5H4EbwM6l0I3ScjPqv4jE/JZ+7I1It2 EdlpVdKqoRFsTWVjQQ8c1PXS6yXo3Lr9dcuMRODmWaRs5ZIc2etzR+G0TFSkQ0Mf0rE0 9L+SjcFvyjxrvE1P5+e7H55VgSRbHDkSBzimKHPCANYkFdC8khrqVRzT7W5mrDr0DO/B Tqy85FcB5a39A478ur0RjWSM17+NrSgyvgnOwEp2fMg0NSnoEXoropi42gpxhWUWnGhy tWJ01tt3sekFXdvxGSt2D68Jl5SYjaHZVliJ6TrfW3JeqRBo+8F6RajHkTzhJpK8VL14 G+rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=igiS7JY9Tkj0t+DmCwo3tZOgXVjRsJpaBhsfH2U83Tk=; b=SWQ7C2PdNsNur5y7cGJGWr47Obs0gLKbhc9TkCI6IUmYSW9yUJS59NzkCxajs65KVg L9lLhpEY4Ps3VgFDfxDatxMM8nu9f02wzVW2Bm3Ywr3kf3OtnshWX6OJKKsiMY32YC8W TkUzCw5mRSOV8icsPOrQWlgxkwDZoGjHCtVESSBYcy+UUe0drj8jLE+djGSQbPl3imeS wDTIbgWvN61xzWblgQ/df9gp3PTeHlAn2tqFKmQd17kpagToQtf533Rz8OqMcMCd9ilB zEGy08xF1PXI8EBpDJMXRV8vYluPIflcLvKsQBjJSw8yJKozl8PgKxiNroVohr1r8DeF fw1Q== X-Gm-Message-State: AJcUukcArwHuby9I6JL0gLlz26xMNMmDkSWJyEoddKszTolAYghXbQym 9Xzipmw4A7aQEGsQPf7/SLU= X-Google-Smtp-Source: ALg8bN5PjATru91+wMlLSq2l4BO4hRMODmPEfcYUsM+BFmU6sD88cDBIUruZ9x9SFsS011ovFvQIlw== X-Received: by 2002:a63:2c82:: with SMTP id s124mr21491137pgs.73.1547913905322; Sat, 19 Jan 2019 08:05:05 -0800 (PST) Received: from localhost (68.168.130.77.16clouds.com. [68.168.130.77]) by smtp.gmail.com with ESMTPSA id t5sm15786032pfb.60.2019.01.19.08.05.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 08:05:04 -0800 (PST) From: Yangtao Li To: myungjoo.ham@samsung.com, kyungmin.park@samsung.com, cw00.choi@samsung.com, linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Yangtao Li Subject: [PATCH 3/3] PM / devfreq: fix mem leak in devfreq_add_device() Date: Sat, 19 Jan 2019 11:04:54 -0500 Message-Id: <20190119160454.23151-3-tiny.windzz@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190119160454.23151-1-tiny.windzz@gmail.com> References: <20190119160454.23151-1-tiny.windzz@gmail.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 'devfreq' is malloced in devfreq_add_device() and should be freed in the error handling cases, otherwise it will cause memory leak. Signed-off-by: Yangtao Li Acked-by: MyungJoo Ham Reviewed-by: Chanwoo Choi --- drivers/devfreq/devfreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 923889229a0b..fe6c157cb7e0 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -651,7 +651,7 @@ struct devfreq *devfreq_add_device(struct device *dev, mutex_unlock(&devfreq->lock); err = set_freq_table(devfreq); if (err < 0) - goto err_out; + goto err_dev; mutex_lock(&devfreq->lock); }