diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-07-11 20:33:50 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-11 20:33:50 -0700 |
| commit | 5944d64a72bf9f4e3f1b8722a8532d5267df2ec8 (patch) | |
| tree | 1facfcf2808383efec5d72f789253a68535902b0 | |
| parent | 93070859a796cb86727b10a7f89c851b1feac112 (diff) | |
| parent | 92875d96c51819a306303fd05def8ee111720b4c (diff) | |
Merge "drivers: soc: qcom: rpm_stats: Fix uninitialized buffer usage"
| -rw-r--r-- | drivers/soc/qcom/rpm_stats.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/soc/qcom/rpm_stats.c b/drivers/soc/qcom/rpm_stats.c index ed7493d063ae..e613da729277 100644 --- a/drivers/soc/qcom/rpm_stats.c +++ b/drivers/soc/qcom/rpm_stats.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2011-2017, 2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -389,7 +389,7 @@ static ssize_t rpmstats_show(struct kobject *kobj, { struct msm_rpmstats_private_data *prvdata = NULL; struct msm_rpmstats_platform_data *pdata = NULL; - ssize_t ret; + ssize_t ret = 0; mutex_lock(&rpm_stats_mutex); pdata = GET_PDATA_OF_ATTR(attr); @@ -428,9 +428,12 @@ static ssize_t rpmstats_show(struct kobject *kobj, else if (prvdata->platform_data->version == 2) prvdata->len = msm_rpmstats_copy_stats_v2( prvdata); + else + goto exit; } ret = snprintf(buf, prvdata->len, "%s", prvdata->buf); +exit: iounmap(prvdata->reg_base); ioremap_fail: kfree(prvdata); |