xc2028: unlock on error in xc2028_set_config()

PATCH New Dan Carpenter 1 participant 1 message Feb 3, 2016

Subsystems (2)

Media (V4L/DVB) Kernel janitors

lore

Share & tools

lore

Dan Carpenter

author

2016-02-03 15:34 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

drivers/media/tuners/tuner-xc2028.c +5 -2

index 082ff56..317ef63 100644
@@ -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;