Skip to content

Commit

Permalink
[media] xc2028: unlock on error in xc2028_set_config()
Browse files Browse the repository at this point in the history
commit 210bd10 upstream.

We have to unlock before returning -ENOMEM.

Fixes: 8dfbcc4 ('[media] xc2028: avoid use after free')

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
  • Loading branch information
Dan Carpenter authored and Jiri Slaby committed Jan 27, 2017
1 parent 74e3d04 commit 6f9247b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/media/tuners/tuner-xc2028.c
Original file line number Diff line number Diff line change
Expand Up @@ -1389,8 +1389,10 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
memcpy(&priv->ctrl, p, sizeof(priv->ctrl));
if (p->fname) {
priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL);
if (priv->ctrl.fname == NULL)
return -ENOMEM;
if (priv->ctrl.fname == NULL) {
rc = -ENOMEM;
goto unlock;
}
}

/*
Expand Down Expand Up @@ -1422,6 +1424,7 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
} else
priv->state = XC2028_WAITING_FIRMWARE;
}
unlock:
mutex_unlock(&priv->lock);

return rc;
Expand Down

0 comments on commit 6f9247b

Please sign in to comment.