Skip to content

Commit

Permalink
firmware: arm_scmi: Fix late checks on pointer dereference
Browse files Browse the repository at this point in the history
A few dereferences could happen before the iterator pointer argument was
checked for NULL, causing the following smatch warnings:

drivers/firmware/arm_scmi/driver.c:1214 scmi_iterator_run() warn: variable
dereferenced before check 'i' (see line 1210)

Fix by moving the checks early and dropping some unneeded local references.

No functional change.

Link: https://lore.kernel.org/r/[email protected]
Reported-by: kernel test robot <[email protected]>
Reported-by: Dan Carpenter <[email protected]>
Signed-off-by: Cristian Marussi <[email protected]>
Signed-off-by: Sudeep Holla <[email protected]>
  • Loading branch information
freefall75 authored and sudeep-holla committed May 3, 2022
1 parent 5e114ad commit c7f8852
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions drivers/firmware/arm_scmi/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1205,18 +1205,21 @@ static void *scmi_iterator_init(const struct scmi_protocol_handle *ph,
static int scmi_iterator_run(void *iter)
{
int ret = -EINVAL;
struct scmi_iterator_ops *iops;
const struct scmi_protocol_handle *ph;
struct scmi_iterator_state *st;
struct scmi_iterator *i = iter;
struct scmi_iterator_state *st = &i->state;
struct scmi_iterator_ops *iops = i->ops;
const struct scmi_protocol_handle *ph = i->ph;
const struct scmi_xfer_ops *xops = ph->xops;

if (!i)
if (!i || !i->ops || !i->ph)
return ret;

iops = i->ops;
ph = i->ph;
st = &i->state;

do {
iops->prepare_message(i->msg, st->desc_index, i->priv);
ret = xops->do_xfer(ph, i->t);
ret = ph->xops->do_xfer(ph, i->t);
if (ret)
break;

Expand All @@ -1240,7 +1243,7 @@ static int scmi_iterator_run(void *iter)
}

st->desc_index += st->num_returned;
xops->reset_rx_to_maxsz(ph, i->t);
ph->xops->reset_rx_to_maxsz(ph, i->t);
/*
* check for both returned and remaining to avoid infinite
* loop due to buggy firmware
Expand All @@ -1249,7 +1252,7 @@ static int scmi_iterator_run(void *iter)

out:
/* Finalize and destroy iterator */
xops->xfer_put(ph, i->t);
ph->xops->xfer_put(ph, i->t);
devm_kfree(ph->dev, i);

return ret;
Expand Down

0 comments on commit c7f8852

Please sign in to comment.