* [PATCH] platform/x86: ISST: unlock on error path in tpmi_sst_init()
@ 2023-03-25 11:08 Dan Carpenter
2023-03-25 19:31 ` srinivas pandruvada
2023-03-27 13:19 ` Hans de Goede
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2023-03-25 11:08 UTC (permalink / raw)
To: Srinivas Pandruvada
Cc: Hans de Goede, Mark Gross, Zhang Rui, platform-driver-x86,
kernel-janitors
Call mutex_unlock(&isst_tpmi_dev_lock) before returning on this
error path.
Fixes: d805456c712f ("platform/x86: ISST: Enumerate TPMI SST and create framework")
Signed-off-by: Dan Carpenter <error27@gmail.com>
---
drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
index cdb56a18ea17..664d2ee60385 100644
--- a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
@@ -1399,8 +1399,10 @@ int tpmi_sst_init(void)
isst_common.sst_inst = kcalloc(topology_max_packages(),
sizeof(*isst_common.sst_inst),
GFP_KERNEL);
- if (!isst_common.sst_inst)
- return -ENOMEM;
+ if (!isst_common.sst_inst) {
+ ret = -ENOMEM;
+ goto init_done;
+ }
memset(&cb, 0, sizeof(cb));
cb.cmd_size = sizeof(struct isst_if_io_reg);
--
2.39.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] platform/x86: ISST: unlock on error path in tpmi_sst_init()
2023-03-25 11:08 [PATCH] platform/x86: ISST: unlock on error path in tpmi_sst_init() Dan Carpenter
@ 2023-03-25 19:31 ` srinivas pandruvada
2023-03-27 13:19 ` Hans de Goede
1 sibling, 0 replies; 3+ messages in thread
From: srinivas pandruvada @ 2023-03-25 19:31 UTC (permalink / raw)
To: Dan Carpenter
Cc: Hans de Goede, Mark Gross, Zhang Rui, platform-driver-x86,
kernel-janitors
This is for linux-next as this is not merged to mainline.
On Sat, 2023-03-25 at 14:08 +0300, Dan Carpenter wrote:
> Call mutex_unlock(&isst_tpmi_dev_lock) before returning on this
> error path.
>
> Fixes: d805456c712f ("platform/x86: ISST: Enumerate TPMI SST and
> create framework")
> Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
> drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c | 6
> ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git
> a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
> b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
> index cdb56a18ea17..664d2ee60385 100644
> --- a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
> +++ b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
> @@ -1399,8 +1399,10 @@ int tpmi_sst_init(void)
> isst_common.sst_inst = kcalloc(topology_max_packages(),
> sizeof(*isst_common.sst_inst),
> GFP_KERNEL);
> - if (!isst_common.sst_inst)
> - return -ENOMEM;
> + if (!isst_common.sst_inst) {
> + ret = -ENOMEM;
> + goto init_done;
> + }
>
> memset(&cb, 0, sizeof(cb));
> cb.cmd_size = sizeof(struct isst_if_io_reg);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] platform/x86: ISST: unlock on error path in tpmi_sst_init()
2023-03-25 11:08 [PATCH] platform/x86: ISST: unlock on error path in tpmi_sst_init() Dan Carpenter
2023-03-25 19:31 ` srinivas pandruvada
@ 2023-03-27 13:19 ` Hans de Goede
1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2023-03-27 13:19 UTC (permalink / raw)
To: Dan Carpenter, Srinivas Pandruvada
Cc: Mark Gross, Zhang Rui, platform-driver-x86, kernel-janitors
Hi,
On 3/25/23 12:08, Dan Carpenter wrote:
> Call mutex_unlock(&isst_tpmi_dev_lock) before returning on this
> error path.
>
> Fixes: d805456c712f ("platform/x86: ISST: Enumerate TPMI SST and create framework")
> Signed-off-by: Dan Carpenter <error27@gmail.com>
Thank you for your patch, I've applied this patch to my review-hans
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.
Regards,
Hans
> ---
> drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
> index cdb56a18ea17..664d2ee60385 100644
> --- a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
> +++ b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
> @@ -1399,8 +1399,10 @@ int tpmi_sst_init(void)
> isst_common.sst_inst = kcalloc(topology_max_packages(),
> sizeof(*isst_common.sst_inst),
> GFP_KERNEL);
> - if (!isst_common.sst_inst)
> - return -ENOMEM;
> + if (!isst_common.sst_inst) {
> + ret = -ENOMEM;
> + goto init_done;
> + }
>
> memset(&cb, 0, sizeof(cb));
> cb.cmd_size = sizeof(struct isst_if_io_reg);
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-27 13:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-25 11:08 [PATCH] platform/x86: ISST: unlock on error path in tpmi_sst_init() Dan Carpenter
2023-03-25 19:31 ` srinivas pandruvada
2023-03-27 13:19 ` Hans de Goede
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).