xc2028: unlock on error in xc2028_set_config()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 3 Feb 2016 15:34:00 +0000 (13:34 -0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 7 Jun 2017 22:47:10 +0000 (00:47 +0200)
commit 210bd104c6acd31c3c6b8b075b3f12d4a9f6b60d upstream.

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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/media/tuners/tuner-xc2028.c

index 38afc54ef3497ba24556c8ccd2e8020bb177b874..ab0bfc46f99f2aaa253af574640d0aa14dd44d41 100644 (file)
@@ -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;
+               }
        }
 
        /*
@@ -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;