From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9A0FC43381 for ; Fri, 22 Mar 2019 11:25:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B68C2218B0 for ; Fri, 22 Mar 2019 11:25:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253943; bh=/WdgL0K6RLWu9lh35MhPit1NBdlmFMc6TuF38/aDf+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lCl/hliFv0ybIWyBfrfjZRWqDEdDdz6yFfSNz2hMFlyhrQG34LIbLMwdeXYUw0PGL Bn4+KWKdIxmRU20lltCqe7GDE9mGSeCReCRamMIs13DXzax/fdv9nR50dWQjZxzrd9 mpdfGd0jzmld6Px/f8xkXzQj5H9AmmJx+a7iKfak= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728773AbfCVLZn (ORCPT ); Fri, 22 Mar 2019 07:25:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:53190 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728241AbfCVLZm (ORCPT ); Fri, 22 Mar 2019 07:25:42 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DF75A21B1A; Fri, 22 Mar 2019 11:25:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253941; bh=/WdgL0K6RLWu9lh35MhPit1NBdlmFMc6TuF38/aDf+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BPGLdxpihXuD5ZYpfyT+G3s7VLlVOfHFe5MBMOGEYAv0lzkdPX5DxIuOQrZU7J4vX JvJ8znApvmfmcutiOa4SahsuB4sHCl1qwTFVQ9Mm/YW7gZAoUkVrRSXtCXLkA40FYQ C9TR/naaw2+SACcYGn+99noAbmz3XiciM83m65pI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Gabriel Fernandez , Dmitry Torokhov , Sasha Levin Subject: [PATCH 3.18 101/134] Input: st-keyscan - fix potential zalloc NULL dereference Date: Fri, 22 Mar 2019 12:15:14 +0100 Message-Id: <20190322111217.468219660@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 2439d37e1bf8a34d437573c086572abe0f3f1b15 ] This patch fixes the following static checker warning: drivers/input/keyboard/st-keyscan.c:156 keyscan_probe() error: potential zalloc NULL dereference: 'keypad_data->input_dev' Reported-by: Dan Carpenter Signed-off-by: Gabriel Fernandez Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/keyboard/st-keyscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/keyboard/st-keyscan.c b/drivers/input/keyboard/st-keyscan.c index de7be4f03d91..ebf9f643d910 100644 --- a/drivers/input/keyboard/st-keyscan.c +++ b/drivers/input/keyboard/st-keyscan.c @@ -153,6 +153,8 @@ static int keyscan_probe(struct platform_device *pdev) input_dev->id.bustype = BUS_HOST; + keypad_data->input_dev = input_dev; + error = keypad_matrix_key_parse_dt(keypad_data); if (error) return error; @@ -168,8 +170,6 @@ static int keyscan_probe(struct platform_device *pdev) input_set_drvdata(input_dev, keypad_data); - keypad_data->input_dev = input_dev; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); keypad_data->base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(keypad_data->base)) -- 2.19.1