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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 AEBAFC43381 for ; Mon, 1 Apr 2019 17:50:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E4A220830 for ; Mon, 1 Apr 2019 17:50:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554141011; bh=WDguwxeG5lsR1GdqjNRsxo/xQLx0+x7DRmMTLqT/Hx8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JmZrxxbswJn+Nfng4UEbpBlNAokWZ0kJz534Y3dGzUYwwey1l1JRzFORmeDcMniQz MjwFxGF9PWOyC2mUtmQTd+ykcj63qAoVzJcqtnBnb3NCBn4s9LUpgjLgvPkZ20BKYk sxJ1ABVI9B6ZOgJI5rTOD6aGgOTSvaRXlH84J/Ek= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732889AbfDAR3E (ORCPT ); Mon, 1 Apr 2019 13:29:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:35314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732869AbfDAR3E (ORCPT ); Mon, 1 Apr 2019 13:29:04 -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 8B3172070B; Mon, 1 Apr 2019 17:29:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139744; bh=WDguwxeG5lsR1GdqjNRsxo/xQLx0+x7DRmMTLqT/Hx8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TRNr4nB+KUVjwOR4rsddZLRjFESkAPPnO9XLv0iTjpIEZh55V13kopbz79PlgzAIR JI+cTf2xwdqdVtwH8jrmhsxz3Crrywm88tRpc62JliyMYvfOAJhK6yEfHHksD/UGXn XYhOUJa2i9fnmtOx09fJH5jxFGxIX6CLDhTmac9M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aditya Pakki Subject: [PATCH 4.9 36/56] serial: max310x: Fix to avoid potential NULL pointer dereference Date: Mon, 1 Apr 2019 19:02:52 +0200 Message-Id: <20190401170105.913169036@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170103.398401360@linuxfoundation.org> References: <20190401170103.398401360@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 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Aditya Pakki commit 3a10e3dd52e80b9a97a3346020024d17b2c272d6 upstream. of_match_device can return a NULL pointer when matching device is not found. This patch avoids a scenario causing NULL pointer derefernce. Signed-off-by: Aditya Pakki Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/max310x.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -1323,6 +1323,8 @@ static int max310x_spi_probe(struct spi_ if (spi->dev.of_node) { const struct of_device_id *of_id = of_match_device(max310x_dt_ids, &spi->dev); + if (!of_id) + return -ENODEV; devtype = (struct max310x_devtype *)of_id->data; } else {