diff options
| author | Cristian Marussi <cristian.marussi@arm.com> | 2024-08-12 19:33:32 +0200 |
|---|---|---|
| committer | Sudeep Holla <sudeep.holla@arm.com> | 2024-08-13 13:15:12 +0200 |
| commit | e98dba934b2fc587eafb83f47ad64d9053b18ae0 (patch) | |
| tree | 489d5a95104ef700718fa762e3cc390fdca9dc05 /drivers/firmware/arm_scmi | |
| parent | dt-bindings: firmware: arm,scmi: Add support for system power protocol (diff) | |
| download | linux-e98dba934b2fc587eafb83f47ad64d9053b18ae0.tar.xz linux-e98dba934b2fc587eafb83f47ad64d9053b18ae0.zip | |
firmware: arm_scmi: Fix double free in OPTEE transport
Channels can be shared between protocols, avoid freeing the same channel
descriptors twice when unloading the stack.
Fixes: 5f90f189a052 ("firmware: arm_scmi: Add optee transport")
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
Tested-by: Peng Fan <peng.fan@nxp.com> #i.MX95 19x19 EVK
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Tested-by: Florian Fainelli <florian.fainelli@broadcom.com>
Message-Id: <20240812173340.3912830-2-cristian.marussi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Diffstat (limited to 'drivers/firmware/arm_scmi')
| -rw-r--r-- | drivers/firmware/arm_scmi/optee.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/firmware/arm_scmi/optee.c b/drivers/firmware/arm_scmi/optee.c index 4e7944b91e38..0c8908d3b1d6 100644 --- a/drivers/firmware/arm_scmi/optee.c +++ b/drivers/firmware/arm_scmi/optee.c @@ -473,6 +473,13 @@ static int scmi_optee_chan_free(int id, void *p, void *data) struct scmi_chan_info *cinfo = p; struct scmi_optee_channel *channel = cinfo->transport_info; + /* + * Different protocols might share the same chan info, so a previous + * call might have already freed the structure. + */ + if (!channel) + return 0; + mutex_lock(&scmi_optee_private->mu); list_del(&channel->link); mutex_unlock(&scmi_optee_private->mu); |