diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-02-03 13:34:00 -0200 |
|---|---|---|
| committer | Min Chong <mchong@google.com> | 2016-09-01 16:08:12 -0700 |
| commit | 30439e51fc6f9ab169f7cb9e8e88faf7fb27ae99 (patch) | |
| tree | 85a820f5d2c06d6cec940adb885a5a03b1e60f19 /drivers | |
| parent | c7a407d41ed5d2c6aa0c1892e1d9ebee58d5a928 (diff) | |
UPSTREAM: [media] xc2028: unlock on error in xc2028_set_config()
(cherry picked from commit 210bd104c6acd31c3c6b8b075b3f12d4a9f6b60d)
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>
Change-Id: I7b6ba9fde5c6e29467e6de23d398af2fe56e2547
Bug: 30946097
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/tuners/tuner-xc2028.c | 7 |
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; |