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=-7.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 67D2CECE563 for ; Mon, 17 Sep 2018 03:06:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D6852147A for ; Mon, 17 Sep 2018 03:06:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microsoft.com header.i=@microsoft.com header.b="fkmUZ/Xf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D6852147A Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=microsoft.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731122AbeIQIcH (ORCPT ); Mon, 17 Sep 2018 04:32:07 -0400 Received: from mail-cys01nam02on0126.outbound.protection.outlook.com ([104.47.37.126]:15104 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731060AbeIQIcA (ORCPT ); Mon, 17 Sep 2018 04:32:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oKaA7yf5iFKhVip937Dnk0AfEJeQjV8UwGpmz8heHA0=; b=fkmUZ/Xf4MhfAozaQ7IenJIDGOJvOJ0A2VfreFOsUCVIridGhzR1UnoAOXByfXmzYTv3tPSiVPIyvtPYekXVIKQbsAzC9FXl1yumuQm2ArGzUuoFyii2ZHlQ2PC7riG+WNNXIyDkVU2ZSLn2AxyOqaBvI8Mbif53zPtOH3nT+t8= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0742.namprd21.prod.outlook.com (10.173.189.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.6; Mon, 17 Sep 2018 03:06:21 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36%5]) with mapi id 15.20.1185.003; Mon, 17 Sep 2018 03:06:21 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Brandon Maier , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL 4.9 41/57] net: phy: xgmiitorgmii: Check phy_driver ready before accessing Thread-Topic: [PATCH AUTOSEL 4.9 41/57] net: phy: xgmiitorgmii: Check phy_driver ready before accessing Thread-Index: AQHUTjMZGiMZS5Lru0C2TC+OZSRgsg== Date: Mon, 17 Sep 2018 03:04:08 +0000 Message-ID: <20180917030340.378-41-alexander.levin@microsoft.com> References: <20180917030340.378-1-alexander.levin@microsoft.com> In-Reply-To: <20180917030340.378-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;CY4PR21MB0742;6:DiHz0RNIiho3BgMIvmFAeTlNJVr+DHcQjewuChrGNYKI6C3wrivIUZow+4rJYMIsiXusX5EwSy/keixIysHTBPM1YlcRnQwK0v+N3kx++BoUCHe3z45xfgPfSzRoROOPuV8itWdYYwB3HBmopx89pDtlVd4SYVnSf7BmUzzOrBEdrhJTq+txaNyTVfEA0uF4rX/zEG2XpCIoNglwENJIVCJvKQXPMrywVCuvq5SgjiafXL9KEGAk3ID3TLQ+QaP0SYfS7golUfBz+oXRhye8eIoXIyoXInHOzKezt7J3nT7cVPCAgwXGkY6YFij3MQLhFrhsIUX8TVIDuiaYCDOsETE9f7jKjpnawQYq+fdQIxjnS0vCDPJF0XquvaJWCHspNX+NAIt38fByL34fxyK5sjdv+X2d5w9NuYb4pA7TyUYyS8la2sL/vlZJYepfd+ZHcuaOBIx092ND638NqKmQ9w==;5:5/JWeJsgjqrcbgIioWFu1xpwj0yY2FlrsNIBrWro+P+eOySuEfQrR+HsPMWd6XmVzo2J1m+VBTsRJ2QwN0stqqg3yQGBR0MLwCc1Fq2RKCxNkE9knpkutKIqUzMQajIp0HDBiNrSd2HsySsqdaaDduj9Jv3FYtHjxVZpr7MyYhk=;7:fYAApQyeiLsD6+93WS9CwcHuJhNBltBYLkhIvIpu8SC1gNWqi9MbaG7fGbKIfhc8vW7hn126kdu4K1tiNjeQKS7JSPUzscYNMJD2exTgohJuoGppwfyHJxK7TkoRNuhBjm2VrJaKjdSA2DPNoL1JuGmcxQuz3hw5FhKG5I312KHo0sL/oYWvdzPjN8R2Iac13XDQStKZ7viFrGvaZNT/34D5LLmsQh0SOr48yRfAbpSWY2+2L/8xOhMKRvRYquhl x-ms-office365-filtering-correlation-id: b2b8f795-7ec5-4c33-8e95-08d61c4a8b7b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020);SRVR:CY4PR21MB0742; x-ms-traffictypediagnostic: CY4PR21MB0742: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(85827821059158)(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231355)(944501410)(52105095)(2018427008)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699050)(76991041);SRVR:CY4PR21MB0742;BCL:0;PCL:0;RULEID:;SRVR:CY4PR21MB0742; x-forefront-prvs: 0798146F16 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(136003)(346002)(366004)(396003)(376002)(199004)(189003)(6486002)(6436002)(6512007)(53936002)(4326008)(3846002)(217873002)(25786009)(2616005)(1076002)(5024004)(14444005)(6506007)(186003)(6346003)(11346002)(446003)(26005)(2900100001)(6116002)(486006)(102836004)(256004)(107886003)(476003)(86612001)(575784001)(86362001)(2501003)(14454004)(97736004)(66066001)(76176011)(6666003)(316002)(54906003)(110136005)(99286004)(68736007)(10090500001)(22452003)(81156014)(2906002)(36756003)(8676002)(8936002)(81166006)(7736002)(305945005)(105586002)(5660300001)(106356001)(10290500003)(478600001)(72206003)(5250100002);DIR:OUT;SFP:1102;SCL:1;SRVR:CY4PR21MB0742;H:CY4PR21MB0776.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: U3fn8lGI1Y/acHdgT5MBZkNKEbRV5A/nqqiGyGszvz6/qFnQ5CwmN8FBTOvGlWpzhnKGNQt3AVzgmNmrdv0J0ILA3NvgahsKmrg3EjwpahOE1h63VKpkDQBnZR26gjFgWR8cGrywDTcAUHuAugR38GIWRTnHGLoVTrFCdUcJkG7XuHhpsEMZYA+YXHycWj3IN2KVLNYQtacM+aMbsaFLKNrsqYYVmi7gtj61U7j7p71i4e0M3okSkP6ehJajU539gjbaixHMdM+J8v6tDBXjD9OsDbaEh6rApqxuFa+Qva4pR8GmJe8cVa5AtMJJFtUD0oY4o2Xf81PQYzVXDAOTU5Ms+3SVC6hbMAxRzUgPTQA= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2b8f795-7ec5-4c33-8e95-08d61c4a8b7b X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Sep 2018 03:04:08.5083 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0742 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Brandon Maier [ Upstream commit ab4e6ee578e88a659938db8fbf33720bc048d29c ] Since a phy_device is added to the global mdio_bus list during phy_device_register(), but a phy_device's phy_driver doesn't get attached until phy_probe(). It's possible of_phy_find_device() in xgmiitorgmii will return a valid phy with a NULL phy_driver. Leading to a NULL pointer access during the memcpy(). Fixes this Oops: Unable to handle kernel NULL pointer dereference at virtual address 0000000= 0 pgd =3D c0004000 [00000000] *pgd=3D00000000 Internal error: Oops: 5 [#1] PREEMPT SMP ARM Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.14.40 #1 Hardware name: Xilinx Zynq Platform task: ce4c8d00 task.stack: ce4ca000 PC is at memcpy+0x48/0x330 LR is at xgmiitorgmii_probe+0x90/0xe8 pc : [] lr : [] psr: 20000013 sp : ce4cbb54 ip : 00000000 fp : ce4cbb8c r10: 00000000 r9 : 00000000 r8 : c0c49178 r7 : 00000000 r6 : cdc14718 r5 : ce762800 r4 : cdc14710 r3 : 00000000 r2 : 00000054 r1 : 00000000 r0 : cdc14718 Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 18c5387d Table: 0000404a DAC: 00000051 Process swapper/0 (pid: 1, stack limit =3D 0xce4ca210) ... [] (memcpy) from [] (xgmiitorgmii_probe+0x90/0xe8) [] (xgmiitorgmii_probe) from [] (mdio_probe+0x28/0x34) [] (mdio_probe) from [] (driver_probe_device+0x254/0x41= 4) [] (driver_probe_device) from [] (__device_attach_drive= r+0xac/0x10c) [] (__device_attach_driver) from [] (bus_for_each_drv+0= x84/0xc8) [] (bus_for_each_drv) from [] (__device_attach+0xd0/0x1= 34) [] (__device_attach) from [] (device_initial_probe+0x1c= /0x20) [] (device_initial_probe) from [] (bus_probe_device+0x9= 8/0xa0) [] (bus_probe_device) from [] (device_add+0x43c/0x5d0) [] (device_add) from [] (mdio_device_register+0x34/0x80= ) [] (mdio_device_register) from [] (of_mdiobus_register+= 0x170/0x30c) [] (of_mdiobus_register) from [] (macb_probe+0x710/0xc0= 0) [] (macb_probe) from [] (platform_drv_probe+0x44/0x80) [] (platform_drv_probe) from [] (driver_probe_device+0x= 254/0x414) [] (driver_probe_device) from [] (__driver_attach+0x10c= /0x118) [] (__driver_attach) from [] (bus_for_each_dev+0x8c/0xd= 0) [] (bus_for_each_dev) from [] (driver_attach+0x2c/0x30) [] (driver_attach) from [] (bus_add_driver+0x50/0x260) [] (bus_add_driver) from [] (driver_register+0x88/0x108= ) [] (driver_register) from [] (__platform_driver_registe= r+0x50/0x58) [] (__platform_driver_register) from [] (macb_driver_in= it+0x24/0x28) [] (macb_driver_init) from [] (do_one_initcall+0x60/0x1= a4) [] (do_one_initcall) from [] (kernel_init_freeable+0x15= c/0x1f8) [] (kernel_init_freeable) from [] (kernel_init+0x18/0x1= 24) [] (kernel_init) from [] (ret_from_fork+0x14/0x20) Code: ba000002 f5d1f03c f5d1f05c f5d1f07c (e8b151f8) ---[ end trace 3e4ec21905820a1f ]--- Signed-off-by: Brandon Maier Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/xilinx_gmii2rgmii.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_g= mii2rgmii.c index 449b31319010..7a14e8170e82 100644 --- a/drivers/net/phy/xilinx_gmii2rgmii.c +++ b/drivers/net/phy/xilinx_gmii2rgmii.c @@ -84,6 +84,11 @@ static int xgmiitorgmii_probe(struct mdio_device *mdiode= v) return -EPROBE_DEFER; } =20 + if (!priv->phy_dev->drv) { + dev_info(dev, "Attached phy not ready\n"); + return -EPROBE_DEFER; + } + priv->addr =3D mdiodev->addr; priv->phy_drv =3D priv->phy_dev->drv; memcpy(&priv->conv_phy_drv, priv->phy_dev->drv, --=20 2.17.1