From: Sudip Mukherjee Date: Wed, 16 Sep 2015 14:04:24 +0000 (+0530) Subject: PCC: fix dereference of ERR_PTR X-Git-Tag: firefly_0821_release~176^2~767^2~8 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d311a28a5853857a73d54d15dc30797aa3b1802d;p=firefly-linux-kernel-4.4.55.git PCC: fix dereference of ERR_PTR get_pcc_channel() does not return NULL on error it returns the error code in ERR_PTR, but we have been checking it for NULL. Signed-off-by: Sudip Mukherjee --- diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index 68885a82e704..45d85aea9955 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -122,7 +122,7 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl, */ chan = get_pcc_channel(subspace_id); - if (!chan || chan->cl) { + if (IS_ERR(chan) || chan->cl) { dev_err(dev, "Channel not found for idx: %d\n", subspace_id); return ERR_PTR(-EBUSY); }