PM / devfreq: Check NULL governor in available_governors_show
authorLeonard Crestez <leonard.crestez@nxp.com>
Tue, 24 Sep 2019 07:26:53 +0000 (10:26 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jan 2020 09:17:57 +0000 (10:17 +0100)
commit d68adc8f85cd757bd33c8d7b2660ad6f16f7f3dc upstream.

The governor is initialized after sysfs attributes become visible so in
theory the governor field can be NULL here.

Fixes: bcf23c79c4e46 ("PM / devfreq: Fix available_governor sysfs")
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/devfreq/devfreq.c

index 7b510ef1d0ddc465f4943155250b13205fd44f2b..ad18de955b6cd93c161f28a653799148ec2c4a7e 100644 (file)
@@ -974,7 +974,7 @@ static ssize_t available_governors_show(struct device *d,
         * The devfreq with immutable governor (e.g., passive) shows
         * only own governor.
         */
-       if (df->governor->immutable) {
+       if (df->governor && df->governor->immutable) {
                count = scnprintf(&buf[count], DEVFREQ_NAME_LEN,
                                   "%s ", df->governor_name);
        /*