mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
mailbox: qcom-ipcc: Guard against NULL con_priv in send_data()
qcom_ipcc_mbox_shutdown() clears chan->con_priv with no locking.
qcom_ipcc_mbox_send_data() dereferences the same field without
checking for NULL first, so a send racing a concurrent shutdown can
crash:
mchan = chan->con_priv;
...
hwirq = qcom_ipcc_get_hwirq(mchan->client_id, mchan->signal_id);
Add the same NULL guard mbox_send_message() already uses for
chan->cl, and bail out before dereferencing a cleared con_priv.
To close the remaining race where send_data() reads con_priv a moment
before a concurrent shutdown clears it, acquire the spinlock in
qcom_ipcc_mbox_shutdown() using the modern guard(spinlock_irqsave)
primitive before setting con_priv to NULL.
Fixes: d6fbfdbc12 ("mailbox: qcom-ipcc: Fix IPCC mbox channel exhaustion")
Cc: stable@vger.kernel.org
Signed-off-by: Anup Vishwakarma <anup.vishwakarma@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com>
This commit is contained in:
parent
18e3e97982
commit
7b3cc361b5
|
|
@ -10,6 +10,7 @@
|
|||
#include <linux/mailbox_controller.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/spinlock.h>
|
||||
|
||||
#include <dt-bindings/mailbox/qcom-ipcc.h>
|
||||
|
||||
|
|
@ -151,6 +152,9 @@ static int qcom_ipcc_mbox_send_data(struct mbox_chan *chan, void *data)
|
|||
struct qcom_ipcc_chan_info *mchan = chan->con_priv;
|
||||
u32 hwirq;
|
||||
|
||||
if (!mchan)
|
||||
return -EINVAL;
|
||||
|
||||
hwirq = qcom_ipcc_get_hwirq(mchan->client_id, mchan->signal_id);
|
||||
writel(hwirq, ipcc->base + IPCC_REG_SEND_ID);
|
||||
|
||||
|
|
@ -159,6 +163,8 @@ static int qcom_ipcc_mbox_send_data(struct mbox_chan *chan, void *data)
|
|||
|
||||
static void qcom_ipcc_mbox_shutdown(struct mbox_chan *chan)
|
||||
{
|
||||
guard(spinlock_irqsave)(&chan->lock);
|
||||
|
||||
chan->con_priv = NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user