From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Torokhov Subject: Re: [PATCH] keyboard: (samsung) fix a missing check of return value Date: Wed, 26 Dec 2018 11:57:20 -0800 Message-ID: <20181226195720.GA5999@dtor-ws> References: <20181226015131.71198-1-kjlu@umn.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20181226015131.71198-1-kjlu@umn.edu> Sender: linux-kernel-owner@vger.kernel.org To: Kangjie Lu Cc: pakki001@umn.edu, Kees Cook , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-input@vger.kernel.org Hi, On Tue, Dec 25, 2018 at 07:51:29PM -0600, Kangjie Lu wrote: > of_device_is_compatible() returns false if the device is incompatible. > The fix adds a check for its return value; > > Signed-off-by: Kangjie Lu > --- > drivers/input/keyboard/samsung-keypad.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c > index 1fe1aa2adf85..5ba940f3f76e 100644 > --- a/drivers/input/keyboard/samsung-keypad.c > +++ b/drivers/input/keyboard/samsung-keypad.c > @@ -387,9 +387,13 @@ static int samsung_keypad_probe(struct platform_device *pdev) > keypad->stopped = true; > init_waitqueue_head(&keypad->wait); > > - if (pdev->dev.of_node) > - keypad->type = of_device_is_compatible(pdev->dev.of_node, > - "samsung,s5pv210-keypad"); > + if (pdev->dev.of_node) { > + error = of_device_is_compatible(pdev->dev.of_node, > + "samsung,s5pv210-keypad"); > + if (!error) > + return -EINVAL; What makes you think that not matching on this compatible is an error? Have you looked at the rest of the dirver? > + keypad->type = error; > + } > else > keypad->type = platform_get_device_id(pdev)->driver_data; > > -- > 2.17.2 (Apple Git-113) > -- Dmitry