From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517179716-2-11378700105085980484 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enro, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517179715; b=slXvnDWQn3VBV/UHSwkjCQdvU3EEmtZcTUjXJAcgsE3snre pfly1mWnA9tfRQTbZyO9xQMyj8V+mB/zxPpdv89CFSCu3E79C2rsRF9dKN+vedja yw9PfaCAbdaL4HL1d83wl0XT0kmrmAxQX53TNz4T36bMbVEk8cBffRLXCeXyfkv9 NHZ5+wHnDJ8qnPQjmDO8tu2f3vG8Rdb5KwWnkL8AVtSTKxcyADIzv9CE59bt+8uw OUzmFvAl+3wZZpoaf3zHF2iWkEDt7RS0JNF5AjgfjWEACPNi+7sV1KTR90/tKZlB M5WZTxOcfXk+ej7H2hjE/to8dV6tTgvzsmAOZbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517179715; bh=OAozx3 4OV1ZgYMfNDu9xAXY9ZGp+8PHYhl+vH7NsSGE=; b=sDaWJIMBiXiAEBkYSrbU+n RbiWMW2gPGStFWxxYlsriU17oEiGcl+T28PGjZ1epybRc4zso+nTprQeKzhe0soS wR238/gJQMW7IiXGlAkWuGZKMuSE/qOtgiuTcQ20Fx5la5h/kMTSkFMzA7ZImdav 4J3tq0AJDGateh11jBuB+XpMAlYruHQxK29UZfb7RmncL7mJ1oiYodkOaEmKFe0H ra0al299igUnB50JOKxgSor2uQy2B5qblBI3G/v1wHVpnc8sYHq4wdab1qBEjxmI ElW8UTn0pouPNSmY6dNK1GWto5UA7KPR4fgvQa1cb+Ya7Xki4Jjj12XumVzvICvg == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=efKmW3Wn x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=efKmW3Wn x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933011AbeA1Wsc (ORCPT ); Sun, 28 Jan 2018 17:48:32 -0500 Received: from mail-sn1nam01on0139.outbound.protection.outlook.com ([104.47.32.139]:17739 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753763AbeA1W3K (ORCPT ); Sun, 28 Jan 2018 17:29:10 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Cai Li , Chunyan Zhang , Stephen Boyd , "Sasha Levin" Subject: [PATCH AUTOSEL for 4.9 36/49] clk: fix a panic error caused by accessing NULL pointer Thread-Topic: [PATCH AUTOSEL for 4.9 36/49] clk: fix a panic error caused by accessing NULL pointer Thread-Index: AQHTmIdAz2oT5Y/DiEOdWvKRgIiZoA== Date: Sun, 28 Jan 2018 22:27:59 +0000 Message-ID: <20180128222727.22404-36-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-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;MW2PR2101MB0924;7:CkkDND9YnPNT+/jJKYTHlZdUHEopsggDkXc04a0ysbDHlOPHxMA4LVx7M6I6iKzZlGP9AS8dnfxOtxhwEPWNx8FBxmb1tM+xKmK0spFfHEuv4LN1cz/D9HCZoL6w6qERoSFrUc/C7RxxdOHoRcmfK+DiQzmQ2NVRVDe80lUZWxxHwqQAqsVnMDPwMKOmmyGBFA6MvKm7mGbvV8HzFIArEg67Mb2LZ+3xi5G6NtF4APzQ7sulH4rHzFJD8vnaFLtm x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 107e82e6-04e9-4cce-3583-08d5669e89d5 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB0924; x-ms-traffictypediagnostic: MW2PR2101MB0924: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:MW2PR2101MB0924;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB0924; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(346002)(39860400002)(366004)(39380400002)(376002)(189003)(199004)(2906002)(26005)(10090500001)(6116002)(3846002)(8936002)(6666003)(86362001)(36756003)(186003)(66066001)(99286004)(1076002)(107886003)(86612001)(4326008)(25786009)(5250100002)(68736007)(2900100001)(2501003)(72206003)(6512007)(3280700002)(22452003)(53936002)(478600001)(10290500003)(106356001)(3660700001)(110136005)(54906003)(97736004)(6436002)(316002)(2950100002)(8676002)(81156014)(76176011)(81166006)(6506007)(105586002)(305945005)(14454004)(6486002)(102836004)(5660300001)(7736002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB0924;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: 9qxTRw3/aRr1Tx+0bKrcw6vcCp0gN2uADw9T73eB5ojs6CMrxwuJ8ZNgkECRTGmpQ99jYZ7xHZrAuJFWD0uNqw== 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: 107e82e6-04e9-4cce-3583-08d5669e89d5 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:59.2286 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0924 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Cai Li [ Upstream commit 975b820b6836b6b6c42fb84cd2e772e2b41bca67 ] In some cases the clock parent would be set NULL when doing re-parent, it will cause a NULL pointer accessing if clk_set trace event is enabled. This patch sets the parent as "none" if the input parameter is NULL. Fixes: dfc202ead312 (clk: Add tracepoints for hardware operations) Signed-off-by: Cai Li Signed-off-by: Chunyan Zhang Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- include/trace/events/clk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/trace/events/clk.h b/include/trace/events/clk.h index 758607226bfd..2cd449328aee 100644 --- a/include/trace/events/clk.h +++ b/include/trace/events/clk.h @@ -134,12 +134,12 @@ DECLARE_EVENT_CLASS(clk_parent, =20 TP_STRUCT__entry( __string( name, core->name ) - __string( pname, parent->name ) + __string( pname, parent ? parent->name : "none" ) ), =20 TP_fast_assign( __assign_str(name, core->name); - __assign_str(pname, parent->name); + __assign_str(pname, parent ? parent->name : "none"); ), =20 TP_printk("%s %s", __get_str(name), __get_str(pname)) --=20 2.11.0