The bcm2835-mailbox returns NULL instead of an error pointer, which could
result in a NULL ptr dereference in mbox_request_channel. So fix this
by returning a proper error pointer.
Signed-off-by: Stefan Wahren <[email protected]>
Fixes: 0bae6af6d704 ("mailbox: Enable BCM2835 mailbox support")
---
drivers/mailbox/bcm2835-mailbox.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c
index cfb4b44..e92bbc5 100644
--- a/drivers/mailbox/bcm2835-mailbox.c
+++ b/drivers/mailbox/bcm2835-mailbox.c
@@ -134,7 +134,7 @@ static struct mbox_chan *bcm2835_mbox_index_xlate(struct mbox_controller *mbox,
const struct of_phandle_args *sp)
{
if (sp->args_count != 0)
- return NULL;
+ return ERR_PTR(-EINVAL);
return &mbox->chans[0];
}
--
2.7.4
Stefan Wahren <[email protected]> writes:
> The bcm2835-mailbox returns NULL instead of an error pointer, which could
> result in a NULL ptr dereference in mbox_request_channel. So fix this
> by returning a proper error pointer.
>
> Signed-off-by: Stefan Wahren <[email protected]>
> Fixes: 0bae6af6d704 ("mailbox: Enable BCM2835 mailbox support")
Reviewed-by: Eric Anholt <[email protected]>