mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
|
From b151b71cd689c9002b94c295bedd8c8c0b7ae98e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dan Carpenter <dan.carpenter@oracle.com>
|
||
|
|
Date: Wed, 3 Feb 2016 13:34:00 -0200
|
||
|
|
Subject: [PATCH] UPSTREAM: [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>
|
||
|
|
(cherry picked from commit 210bd104c6acd31c3c6b8b075b3f12d4a9f6b60d)
|
||
|
|
Bug: 30946097
|
||
|
|
|
||
|
|
Change-Id: I2d0bab35824d204a05de36e265c443938033eb81
|
||
|
|
---
|
||
|
|
drivers/media/tuners/tuner-xc2028.c | 7 +++++--
|
||
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c
|
||
|
|
index 38afc54ef3497..ab0bfc46f99f2 100644
|
||
|
|
--- a/drivers/media/tuners/tuner-xc2028.c
|
||
|
|
+++ b/drivers/media/tuners/tuner-xc2028.c
|
||
|
|
@@ -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;
|