* [PATCH] s3c-adc-battery: Fix possible NULL pointer dereference
@ 2013-02-24 23:03 Syam Sidhardhan
2013-03-19 2:43 ` Anton Vorontsov
0 siblings, 1 reply; 2+ messages in thread
From: Syam Sidhardhan @ 2013-02-24 23:03 UTC (permalink / raw)
To: netdev, linux-kernel; +Cc: syamsidhardh, dwmw2, cbou
Check for (bat == NULL) has to be done before accessing bat
Signed-off-by: Syam Sidhardhan <s.syam@samsung.com>
---
drivers/power/s3c_adc_battery.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c
index d2ca989..5948ce0 100644
--- a/drivers/power/s3c_adc_battery.c
+++ b/drivers/power/s3c_adc_battery.c
@@ -145,14 +145,17 @@ static int s3c_adc_bat_get_property(struct power_supply *psy,
int new_level;
int full_volt;
- const struct s3c_adc_bat_thresh *lut = bat->pdata->lut_noac;
- unsigned int lut_size = bat->pdata->lut_noac_cnt;
+ const struct s3c_adc_bat_thresh *lut;
+ unsigned int lut_size;
if (!bat) {
dev_err(psy->dev, "no battery infos ?!\n");
return -EINVAL;
}
+ lut = bat->pdata->lut_noac;
+ lut_size = bat->pdata->lut_noac_cnt;
+
if (bat->volt_value < 0 || bat->cur_value < 0 ||
jiffies_to_msecs(jiffies - bat->timestamp) >
BAT_POLL_INTERVAL) {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] s3c-adc-battery: Fix possible NULL pointer dereference
2013-02-24 23:03 [PATCH] s3c-adc-battery: Fix possible NULL pointer dereference Syam Sidhardhan
@ 2013-03-19 2:43 ` Anton Vorontsov
0 siblings, 0 replies; 2+ messages in thread
From: Anton Vorontsov @ 2013-03-19 2:43 UTC (permalink / raw)
To: Syam Sidhardhan; +Cc: netdev, linux-kernel, dwmw2
On Mon, Feb 25, 2013 at 04:33:25AM +0530, Syam Sidhardhan wrote:
> Check for (bat == NULL) has to be done before accessing bat
>
> Signed-off-by: Syam Sidhardhan <s.syam@samsung.com>
> ---
Applied, thanks!
> drivers/power/s3c_adc_battery.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c
> index d2ca989..5948ce0 100644
> --- a/drivers/power/s3c_adc_battery.c
> +++ b/drivers/power/s3c_adc_battery.c
> @@ -145,14 +145,17 @@ static int s3c_adc_bat_get_property(struct power_supply *psy,
>
> int new_level;
> int full_volt;
> - const struct s3c_adc_bat_thresh *lut = bat->pdata->lut_noac;
> - unsigned int lut_size = bat->pdata->lut_noac_cnt;
> + const struct s3c_adc_bat_thresh *lut;
> + unsigned int lut_size;
>
> if (!bat) {
> dev_err(psy->dev, "no battery infos ?!\n");
> return -EINVAL;
> }
>
> + lut = bat->pdata->lut_noac;
> + lut_size = bat->pdata->lut_noac_cnt;
> +
> if (bat->volt_value < 0 || bat->cur_value < 0 ||
> jiffies_to_msecs(jiffies - bat->timestamp) >
> BAT_POLL_INTERVAL) {
> --
> 1.7.9.5
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-19 2:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-24 23:03 [PATCH] s3c-adc-battery: Fix possible NULL pointer dereference Syam Sidhardhan
2013-03-19 2:43 ` Anton Vorontsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).