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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 10B8FC10F00 for ; Tue, 19 Mar 2019 00:26:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5814213F2 for ; Tue, 19 Mar 2019 00:26:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="UlWp7EZK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727000AbfCSA0i (ORCPT ); Mon, 18 Mar 2019 20:26:38 -0400 Received: from mta-p8.oit.umn.edu ([134.84.196.208]:48636 "EHLO mta-p8.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726438AbfCSA0h (ORCPT ); Mon, 18 Mar 2019 20:26:37 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id 2F63EB48 for ; Tue, 19 Mar 2019 00:26:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2WjJw4m20J6l for ; Mon, 18 Mar 2019 19:26:36 -0500 (CDT) Received: from mail-it1-f198.google.com (mail-it1-f198.google.com [209.85.166.198]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p8.oit.umn.edu (Postfix) with ESMTPS id 06E51A87 for ; Mon, 18 Mar 2019 19:26:35 -0500 (CDT) Received: by mail-it1-f198.google.com with SMTP id z131so16090012itb.2 for ; Mon, 18 Mar 2019 17:26:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=OKcCKs/xYcl9Epux1dC9Bd1VY22SUBZOx1LoJhQbK3k=; b=UlWp7EZKS7XwukfjHxGwZZdb5MOb7pTJZw8mDpSJ/Qzpvbu9hVou2VAktM61X1rsZy j7r5lfj4vhLs8ydaxA9ao63rzvSL3xK/FsSDNr0vg4vDjnjiQ74d+ATkL8loVDiNqeBq bJczM8mw9xlgKGK1/THi/XLJ8uAbrHcraGdWtsm2bxnQ4SUrDe0OlEf/BqFw2L+x5zP0 yNb0t2/zjIwlz8AszSNqDB7QJaLcezbfANSaj75jHsE9Ae/ZS1q+Q0CZPNAzVvS+HdmY CBB0E9ZqvyP3SROaQni/SMqqyEaTYcAszw3zVI+xA8VMreamjexXJyerlY8lN3JgnaFa YeYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OKcCKs/xYcl9Epux1dC9Bd1VY22SUBZOx1LoJhQbK3k=; b=cD3g3ncW+WISg8q4FoAgHudoQl+hf2tfHdHPfHE53EExUpRT44dGKvmE7NOSm/Q4Dm OBJmBxsTu89L9JfGjInwYITS13cP/NQd4oORIB7D0t1Y5Hfh+7Xd83hQr9o7IMwySKrS SGJ5uoQ1cXStXtyIunOCft/9815BjSOGh0Py8y589JsaQDh4gr3eZUYwVB2pHJUmIAFc dA2vRKenMmqU9GosMNwtLsyQPwQ6lQ6tJeN2hYv0TuEIUqn2cWz94D8U0oR3zN2Oszeb 5KaTeMGXqKAFLpGgkE2OhkLQ6hSYn51knR/tPxiGhn3xUwdZiTZ+QY8x0MvI/yhlvS72 RNUA== X-Gm-Message-State: APjAAAXahkk3nNFYPiudR/cV5liAN7ijh+wtAXTcEqYDMQLDd7U5R+X+ LW0hMVjZaUuzqvilb75bJILT2z+7R4vc4myAOKeFkfGJ/b0951XPd9cb6C8wsr6mlEbfGAM83mw z9cg1Gn134lQsnuUaX6kyIw58nHuW X-Received: by 2002:a24:2946:: with SMTP id p67mr1028402itp.114.1552955195621; Mon, 18 Mar 2019 17:26:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzcAY+bv3B/ximDoBnh912vC+9939t8Yge1Igs9QzN6ckUxBuMwE+bGjexclZOwRD266Ayxqg== X-Received: by 2002:a24:2946:: with SMTP id p67mr1028395itp.114.1552955195419; Mon, 18 Mar 2019 17:26:35 -0700 (PDT) Received: from lenovo-1.hsd1.mn.comcast.net (c-73-242-25-233.hsd1.mn.comcast.net. [73.242.25.233]) by smtp.googlemail.com with ESMTPSA id w6sm4729538iom.22.2019.03.18.17.26.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 17:26:34 -0700 (PDT) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, Will Deacon , Lorenzo Pieralisi , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI: Fix to avoid potential NULL pointer dereference Date: Mon, 18 Mar 2019 19:26:30 -0500 Message-Id: <20190319002630.12485-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In gen_pci_probe, of_match_node can return a NULL pointer in case of failure. The patch avoids a NULL pointer dereference in such a scenario. Signed-off-by: Aditya Pakki --- drivers/pci/controller/pci-host-generic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/controller/pci-host-generic.c b/drivers/pci/controller/pci-host-generic.c index dea3ec7592a2..85f473f50e96 100644 --- a/drivers/pci/controller/pci-host-generic.c +++ b/drivers/pci/controller/pci-host-generic.c @@ -83,6 +83,8 @@ static int gen_pci_probe(struct platform_device *pdev) struct pci_ecam_ops *ops; of_id = of_match_node(gen_pci_of_match, pdev->dev.of_node); + if (!of_id) + return -ENXIO; ops = (struct pci_ecam_ops *)of_id->data; return pci_host_common_probe(pdev, ops); -- 2.17.1 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 C694CC43381 for ; Tue, 19 Mar 2019 00:26:50 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 95254213F2 for ; Tue, 19 Mar 2019 00:26:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dVaSt2/r"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="UlWp7EZK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95254213F2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=umn.edu Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=MGr7kGIo+/3jGJEwHT+3/WQxHqRAkC0XYJx/4lJKjJc=; b=dVa St2/rAXOGaE9qq601Q3ghSHXJCEjN+IlSx8DzCZwwl3jU7a58TY9GJG86+fE75J6gxT0oHO3FMS33 ZR2v1MMAQy1cxm3OmGtG4hv+hBsuUKzZZUHUWyCWIKL9taWHkRGBKx+Cge0Oex+tQA1aPieUrM9H8 NsdgzNqL3dHKjeVo/mPPBHpkg09Bv0dGLgYymCe0eF2CmutTZXyMEFx7ZOIzGSJl7f17TXdBxW0jr s7B6af2xLjwSItCY/2ptF5FHOROyH/KHfLrR0vSCaErF5k7kThYOvqGQm3kj8YPBWNONcGrdQdKLA Bh/3cj93uC4sQivuoSI46HbT/xb0dBA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h62aZ-0007vp-BJ; Tue, 19 Mar 2019 00:26:43 +0000 Received: from mta-p5.oit.umn.edu ([134.84.196.205]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h62aW-0007vL-82 for linux-arm-kernel@lists.infradead.org; Tue, 19 Mar 2019 00:26:41 +0000 Received: from localhost (unknown [127.0.0.1]) by mta-p5.oit.umn.edu (Postfix) with ESMTP id 308DEAA5 for ; Tue, 19 Mar 2019 00:26:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p5.oit.umn.edu ([127.0.0.1]) by localhost (mta-p5.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EEakhJHoZY4W for ; Mon, 18 Mar 2019 19:26:36 -0500 (CDT) Received: from mail-it1-f200.google.com (mail-it1-f200.google.com [209.85.166.200]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p5.oit.umn.edu (Postfix) with ESMTPS id EB7605D for ; Mon, 18 Mar 2019 19:26:35 -0500 (CDT) Received: by mail-it1-f200.google.com with SMTP id w200so16030911itc.8 for ; Mon, 18 Mar 2019 17:26:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=OKcCKs/xYcl9Epux1dC9Bd1VY22SUBZOx1LoJhQbK3k=; b=UlWp7EZKS7XwukfjHxGwZZdb5MOb7pTJZw8mDpSJ/Qzpvbu9hVou2VAktM61X1rsZy j7r5lfj4vhLs8ydaxA9ao63rzvSL3xK/FsSDNr0vg4vDjnjiQ74d+ATkL8loVDiNqeBq bJczM8mw9xlgKGK1/THi/XLJ8uAbrHcraGdWtsm2bxnQ4SUrDe0OlEf/BqFw2L+x5zP0 yNb0t2/zjIwlz8AszSNqDB7QJaLcezbfANSaj75jHsE9Ae/ZS1q+Q0CZPNAzVvS+HdmY CBB0E9ZqvyP3SROaQni/SMqqyEaTYcAszw3zVI+xA8VMreamjexXJyerlY8lN3JgnaFa YeYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OKcCKs/xYcl9Epux1dC9Bd1VY22SUBZOx1LoJhQbK3k=; b=WuR6gIP445l8xpQur1a8C5twxXkqFT/LayLD3hXthYDL0oeqeHRrodMd4gTfmNZ1ks ekZTuH8jRZKYy8KaGsrhAiyK4724Wrhc8BBXJ39IDGdQk84CrGDYYWGZ+TnWrLdMfFVe 7LLxj/Ems3NVvncDVAH6MDuRCnMyIOEHlpKjpa8sqtZnbyoXKKDWmkDPh2uubwdLqpRb 8z4ag7/q7gUxasLa2iUzqGX1ClEeT+owE4xRa1ZAo3sSmcsXhyZcvsS3WKHOiS5ViX1s yyTJzA31vk7ssxkiCr807zCay/6gIEk0gb+X/vai/Duf/ADM+QGWLajDYQXsnOYPtmrt nO2Q== X-Gm-Message-State: APjAAAWwfDoZeTkapFZ4u6NI8rVz5N6FplN5NQvpN9Nf2LXc+hpxLOPF 6RH3wXyDG81sc6JYTek90g/n1byYROAfKATVum+nXZeG4xCDS24w+U4rrzNOTMjCLD+w4K0DVZI +CcYRwfgxF4TLB/LqGl9i0INm9CoQ6mOrDKtFlWE= X-Received: by 2002:a24:2946:: with SMTP id p67mr1028403itp.114.1552955195621; Mon, 18 Mar 2019 17:26:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzcAY+bv3B/ximDoBnh912vC+9939t8Yge1Igs9QzN6ckUxBuMwE+bGjexclZOwRD266Ayxqg== X-Received: by 2002:a24:2946:: with SMTP id p67mr1028395itp.114.1552955195419; Mon, 18 Mar 2019 17:26:35 -0700 (PDT) Received: from lenovo-1.hsd1.mn.comcast.net (c-73-242-25-233.hsd1.mn.comcast.net. [73.242.25.233]) by smtp.googlemail.com with ESMTPSA id w6sm4729538iom.22.2019.03.18.17.26.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 17:26:34 -0700 (PDT) From: Aditya Pakki To: pakki001@umn.edu Subject: [PATCH] PCI: Fix to avoid potential NULL pointer dereference Date: Mon, 18 Mar 2019 19:26:30 -0500 Message-Id: <20190319002630.12485-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_172640_387463_FC8DCC54 X-CRM114-Status: GOOD ( 11.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , kjlu@umn.edu, Will Deacon , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Bjorn Helgaas , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org In gen_pci_probe, of_match_node can return a NULL pointer in case of failure. The patch avoids a NULL pointer dereference in such a scenario. Signed-off-by: Aditya Pakki --- drivers/pci/controller/pci-host-generic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/controller/pci-host-generic.c b/drivers/pci/controller/pci-host-generic.c index dea3ec7592a2..85f473f50e96 100644 --- a/drivers/pci/controller/pci-host-generic.c +++ b/drivers/pci/controller/pci-host-generic.c @@ -83,6 +83,8 @@ static int gen_pci_probe(struct platform_device *pdev) struct pci_ecam_ops *ops; of_id = of_match_node(gen_pci_of_match, pdev->dev.of_node); + if (!of_id) + return -ENXIO; ops = (struct pci_ecam_ops *)of_id->data; return pci_host_common_probe(pdev, ops); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel