thermal/lib: Fix memory leak on error in thermal_genl_auto()

[ Upstream commit 7569406e95f2353070d88ebc88e8c13698542317 ]

The function thermal_genl_auto() does not free the allocated message
in the error path. Fix that by putting a out label and jump to it
which will free the message instead of directly returning an error.

Fixes: 47c4b0de080a ("tools/lib/thermal: Add a thermal library")
Reported-by: Lukasz Luba <lukasz.luba@arm.com>\a
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Link: https://patch.msgid.link/20241024105938.1095358-1-daniel.lezcano@linaro.org
[ rjw: Fixed up the !msg error path, added Fixes tag ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/lib/thermal/commands.c b/tools/lib/thermal/commands.c
index a9223df91dcf5e420d4055025179fe59a4aae117..27b4442f0e347ac7c4c2882866b3248087e46011 100644 (file)
--- a/tools/lib/thermal/commands.c
+++ b/tools/lib/thermal/commands.c
@@ -279,6 +279,7 @@ static thermal_error_t thermal_genl_auto(struct thermal_handler *th, cmd_cb_t cm
                                         struct cmd_param *param,
                                         int cmd, int flags, void *arg)
 {
+       thermal_error_t ret = THERMAL_ERROR;
        struct nl_msg *msg;
        void *hdr;
 
@@ -289,17 +290,19 @@ static thermal_error_t thermal_genl_auto(struct thermal_handler *th, cmd_cb_t cm
        hdr = genlmsg_put(msg, NL_AUTO_PORT, NL_AUTO_SEQ, thermal_cmd_ops.o_id,
                          0, flags, cmd, THERMAL_GENL_VERSION);
        if (!hdr)
-               return THERMAL_ERROR;
+               goto out;
 
        if (cmd_cb && cmd_cb(msg, param))
-               return THERMAL_ERROR;
+               goto out;
 
        if (nl_send_msg(th->sk_cmd, th->cb_cmd, msg, genl_handle_msg, arg))
-               return THERMAL_ERROR;
+               goto out;
 
+       ret = THERMAL_SUCCESS;
+out:
        nlmsg_free(msg);
 
-       return THERMAL_SUCCESS;
+       return ret;
 }
 
 thermal_error_t thermal_cmd_get_tz(struct thermal_handler *th, struct thermal_zone **tz)