| Message ID | 20230718140659.4009167-1-harshit.m.mogalapalli@oracle.com |
|---|---|
| State | Accepted |
| Commit | 4b9fbbd58e35337d59431e988149930c1987dc30 |
| Headers | show |
| Series | [v2,next] media: i2c: fix error handling in ub960_rxport_add_serializer() | expand |
On 18/07/2023 17:06, Harshit Mogalapalli wrote: > Smatch warns: > drivers/media/i2c/ds90ub960.c:1671 ub960_rxport_add_serializer(): > err: 'rxport->ser.client' dereferencing possible ERR_PTR() > > i2c_new_client_device() returns error pointers on failure and in > dev_dbg statement we are dereferencing error pointer which is a bug. > > Fix this by using IS_ERR() which checks for error pointers. > > Fixes: afe267f2d368 ("media: i2c: add DS90UB960 driver") > Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com> > --- > This is based on static analysis and only compile tested. > > V1->V2: Suggestion from Tomi Valkeinen: Propogate the error code with > PTR_ERR() instead of -EIO. > --- > drivers/media/i2c/ds90ub960.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/i2c/ds90ub960.c b/drivers/media/i2c/ds90ub960.c > index e101bcf2356a..92aa004a3674 100644 > --- a/drivers/media/i2c/ds90ub960.c > +++ b/drivers/media/i2c/ds90ub960.c > @@ -1662,10 +1662,10 @@ static int ub960_rxport_add_serializer(struct ub960_data *priv, u8 nport) > ser_info.addr = rxport->ser.alias; > rxport->ser.client = > i2c_new_client_device(priv->client->adapter, &ser_info); > - if (!rxport->ser.client) { > + if (IS_ERR(rxport->ser.client)) { > dev_err(dev, "rx%u: cannot add %s i2c device", nport, > ser_info.type); > - return -EIO; > + return PTR_ERR(rxport->ser.client); > } > > dev_dbg(dev, "rx%u: remote serializer at alias 0x%02x (%u-%04x)\n", Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Tomi
diff --git a/drivers/media/i2c/ds90ub960.c b/drivers/media/i2c/ds90ub960.c index e101bcf2356a..92aa004a3674 100644 --- a/drivers/media/i2c/ds90ub960.c +++ b/drivers/media/i2c/ds90ub960.c @@ -1662,10 +1662,10 @@ static int ub960_rxport_add_serializer(struct ub960_data *priv, u8 nport) ser_info.addr = rxport->ser.alias; rxport->ser.client = i2c_new_client_device(priv->client->adapter, &ser_info); - if (!rxport->ser.client) { + if (IS_ERR(rxport->ser.client)) { dev_err(dev, "rx%u: cannot add %s i2c device", nport, ser_info.type); - return -EIO; + return PTR_ERR(rxport->ser.client); } dev_dbg(dev, "rx%u: remote serializer at alias 0x%02x (%u-%04x)\n",
Smatch warns: drivers/media/i2c/ds90ub960.c:1671 ub960_rxport_add_serializer(): err: 'rxport->ser.client' dereferencing possible ERR_PTR() i2c_new_client_device() returns error pointers on failure and in dev_dbg statement we are dereferencing error pointer which is a bug. Fix this by using IS_ERR() which checks for error pointers. Fixes: afe267f2d368 ("media: i2c: add DS90UB960 driver") Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com> --- This is based on static analysis and only compile tested. V1->V2: Suggestion from Tomi Valkeinen: Propogate the error code with PTR_ERR() instead of -EIO. --- drivers/media/i2c/ds90ub960.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)