diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-24 06:13:23 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-24 06:13:22 -0800 |
| commit | f3e00aadcd1f5baf6b617b5af6680aecfe353dcf (patch) | |
| tree | 62e1a608d227b94f255f2582d0dcc498a8b7ec6b | |
| parent | 065421c6fa6fe9f0c15a11ba0a58e8bba5e890d7 (diff) | |
| parent | 694339fd334eb68a3e61703a971cafcc3775ee29 (diff) | |
Merge "[media] xc2028: avoid use after free"
| -rw-r--r-- | drivers/media/tuners/tuner-xc2028.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c index 4e941f00b600..082ff5608455 100644 --- a/drivers/media/tuners/tuner-xc2028.c +++ b/drivers/media/tuners/tuner-xc2028.c @@ -1403,11 +1403,12 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg) * in order to avoid troubles during device release. */ kfree(priv->ctrl.fname); + priv->ctrl.fname = NULL; memcpy(&priv->ctrl, p, sizeof(priv->ctrl)); if (p->fname) { priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL); if (priv->ctrl.fname == NULL) - rc = -ENOMEM; + return -ENOMEM; } /* |