Commit 1d572520 authored by Dan Carpenter's avatar Dan Carpenter Committed by Ben Hutchings

xc2028: unlock on error in xc2028_set_config()

commit 210bd104 upstream.

We have to unlock before returning -ENOMEM.

Fixes: 8dfbcc43 ('[media] xc2028: avoid use after free')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent e6cb39ac
...@@ -1407,8 +1407,10 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg) ...@@ -1407,8 +1407,10 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
memcpy(&priv->ctrl, p, sizeof(priv->ctrl)); memcpy(&priv->ctrl, p, sizeof(priv->ctrl));
if (p->fname) { if (p->fname) {
priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL); priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL);
if (priv->ctrl.fname == NULL) if (priv->ctrl.fname == NULL) {
return -ENOMEM; rc = -ENOMEM;
goto unlock;
}
} }
/* /*
...@@ -1440,6 +1442,7 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg) ...@@ -1440,6 +1442,7 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
} else } else
priv->state = XC2028_WAITING_FIRMWARE; priv->state = XC2028_WAITING_FIRMWARE;
} }
unlock:
mutex_unlock(&priv->lock); mutex_unlock(&priv->lock);
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment