From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754923AbaE1Qnd (ORCPT ); Wed, 28 May 2014 12:43:33 -0400 Received: from mail-lb0-f175.google.com ([209.85.217.175]:47084 "EHLO mail-lb0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754851AbaE1Qnb (ORCPT ); Wed, 28 May 2014 12:43:31 -0400 From: Emil Goode To: Samuel Ortiz , Lee Jones , Jingoo Han Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Emil Goode Subject: [PATCH v2] mfd: fix unintentional NULL check in menelaus_set_voltage() Date: Wed, 28 May 2014 18:43:51 +0200 Message-Id: <1401295431-23833-1-git-send-email-emilgoode@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The struct menelaus_vtg pointer vtg cannot be NULL here so the condition is never true and if it ever was true it would lead to a NULL pointer dereference when we goto label set_voltage. Before the below patch was applied the code was: if (vtg == 0) The intention was to check if vtg_val is 0. commit 59a9f7a32adf6537b4e4db8ca204eeb77d7a634e ("mfd: menelaus: Use NULL instead of 0") Signed-off-by: Emil Goode --- v2: Changed (vtg_val == 0) to (!vtg_val) drivers/mfd/menelaus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index ad25bfa..40df76a 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -466,7 +466,7 @@ static int menelaus_set_voltage(const struct menelaus_vtg *vtg, int mV, struct i2c_client *c = the_menelaus->client; mutex_lock(&the_menelaus->lock); - if (!vtg) + if (!vtg_val) goto set_voltage; ret = menelaus_read_reg(vtg->vtg_reg); -- 1.7.10.4