aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/tuners
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-02-03 13:34:00 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-04 09:30:31 -0200
commit210bd104c6acd31c3c6b8b075b3f12d4a9f6b60d (patch)
treeb41daadc7810a4335fcb450cee70ae04e2195801 /drivers/media/tuners
parent[media] dvb_frontend: print DTV property dump also for SET_PROPERTY (diff)
downloadlinux-dev-210bd104c6acd31c3c6b8b075b3f12d4a9f6b60d.tar.xz
linux-dev-210bd104c6acd31c3c6b8b075b3f12d4a9f6b60d.zip
[media] xc2028: unlock on error in xc2028_set_config()
We have to unlock before returning -ENOMEM. Fixes: 8dfbcc4351a0 ('[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>
Diffstat (limited to 'drivers/media/tuners')
-rw-r--r--drivers/media/tuners/tuner-xc2028.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c
index 082ff5608455..317ef63ee789 100644
--- a/drivers/media/tuners/tuner-xc2028.c
+++ b/drivers/media/tuners/tuner-xc2028.c
@@ -1407,8 +1407,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;
+ }
}
/*
@@ -1440,6 +1442,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;