From patchwork Sun Feb 24 23:03:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Syam Sidhardhan X-Patchwork-Id: 222804 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 538942C0294 for ; Mon, 25 Feb 2013 10:04:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759170Ab3BXXDm (ORCPT ); Sun, 24 Feb 2013 18:03:42 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:34278 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758985Ab3BXXDl (ORCPT ); Sun, 24 Feb 2013 18:03:41 -0500 Received: by mail-pa0-f52.google.com with SMTP id fb1so1393057pad.11 for ; Sun, 24 Feb 2013 15:03:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=NBKyBehCBJn/Qr9VmiXQdF4/P68MIvH0USDYZ3Zrz/g=; b=bx4oqA/QVRJM6BuzLRBtrrmmfGt/GGPSaNpWZveX2FbR7/9QFC6SEeUuItW1HnrSYi a2VsZ/1A15t0LnnPpSqshXlhg93m+291FLNTFflIWAPQr0t+ulrtVKOOHt+3Fi+iMqtP BHBZUs4quGxziCGh5NImlzGRVZcGMNkbd75GiQ6ubb7exzvodUkHqPVpAWtd5ahdfkLH Sd05j+hwm9on0d7KvkpMbv2fMrL/DtjwwdCO0WCTtfC/tkzwzn0bnBH6x4yGdvrRwX0v TgkOewO/BZafRWpWcNbz3yJXEf9ijJbBP32EknYNvf+YcymXpOo3Bz7AD7lq1YKg9Dmp elZA== X-Received: by 10.68.137.161 with SMTP id qj1mr15004837pbb.168.1361747020859; Sun, 24 Feb 2013 15:03:40 -0800 (PST) Received: from localhost.localdomain ([27.7.134.34]) by mx.google.com with ESMTPS id z6sm11366991pav.3.2013.02.24.15.03.37 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 24 Feb 2013 15:03:39 -0800 (PST) From: Syam Sidhardhan To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: syamsidhardh@gmail.com, dwmw2@infradead.org, cbou@mail.ru Subject: [PATCH] s3c-adc-battery: Fix possible NULL pointer dereference Date: Mon, 25 Feb 2013 04:33:25 +0530 Message-Id: <1361747005-29306-1-git-send-email-s.syam@samsung.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Check for (bat == NULL) has to be done before accessing bat Signed-off-by: Syam Sidhardhan --- 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) {