Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp656654img; Fri, 22 Mar 2019 06:03:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqx3CVZvQIhr12Hh2df04ScZpM9/8CrOAL+G0fplhelAObRWduJx8CYGC7JuW9shmtuv8tMM X-Received: by 2002:a63:5a47:: with SMTP id k7mr5064526pgm.174.1553259819266; Fri, 22 Mar 2019 06:03:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553259819; cv=none; d=google.com; s=arc-20160816; b=oIn6xomO3MkY/9e4hzzb6QIC1Auufj9Dv4cFeKbIE+PS5nEoRMlmVVFPnLEY7kifws e1GkFt74S8cr/cEs4kG/TA5Bwu8llcCnEQ+u4VysP0SoNKx0VfWFA0XcdJzKfRw3zVGX ZogCCBhDDTmT+1kVYOiZq5xuHFLwMVeFLgBnoHiT8BO6M9dmHn0lKHJX3y3EwRg/MBap 3Z+OuOIqSaTBEJKzyEGJadvZYGQKDcODTBh/6ztBq/AftUPuuA6M3iBRVPy5+dk+Hyku pu3ovc75z/AZukixQ3998d2UPPh7wwKmXGh7pz2Q9V3wPF7dciCj/BK74uZVQVoEgUSS 3jCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/2JpvWh1jbpEf1fMlXP7QWcZYbhKmLY5xTz2pNwAqY4=; b=SlydE9e5Na0HY3BQtgHC8dv7ldHIz/RQ1rnz6nyLaZ88FldcRwlwnrcezDpElKZA3b /HgXsZWCNRxL28vRFdVOkMEdmZATk5HApg2oVSWp6yqSWZDA5OQrwefzHcQXBLnPmga/ X4dczJZCgHw3wPYAet9vrXMbaesXsVo1Zz71beLF0xG+r1Wkx865rCcMo0DvqGgy2miD zt8x7EcL1nsFkxN3tNu30mFrwmC7tfiQV6QSNhoSHlppR+GlwzxbBvnst22s3PO6lfXQ rZuD6v/eF/sFFV0DEAbS7p/ExUF9X/0UqN5fmBBfk9XIttiQC+cxhsWqKkYurutRTugR v7yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="W/W/j1XG"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h3si6517777pfj.137.2019.03.22.06.03.23; Fri, 22 Mar 2019 06:03:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="W/W/j1XG"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731204AbfCVLlU (ORCPT + 99 others); Fri, 22 Mar 2019 07:41:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:43378 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731381AbfCVLlR (ORCPT ); Fri, 22 Mar 2019 07:41:17 -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 530932082C; Fri, 22 Mar 2019 11:41:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254876; bh=sc7TD6ZkCiJPjO9MvyuvYt+yigPCFv2LoQWSUhM6/yg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W/W/j1XG+oPuSwAxbrJdb0li6gNfncz+1ODHQk4hF55jgX18OfPhlDf8asurpX2lJ Z8C1gL5rU4zaAWTYD+iAreRMjoCG0E12ZYXKx13N5wqNjsuz15b4us2DEm9iU1KfUC d9QruEug82/EdBRZfDHoMKe79TSbRwYOzis1/tUY= 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 4.9 020/118] Input: st-keyscan - fix potential zalloc NULL dereference Date: Fri, 22 Mar 2019 12:14:52 +0100 Message-Id: <20190322111217.428447075@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111215.873964544@linuxfoundation.org> References: <20190322111215.873964544@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-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