From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517180469-2-14632224618083753495 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=1517180468; b=Zk08Jr7NPSCPx85LQbAzEBLyLmZ8YXxOndX2W2RfqB4ec7i 8UJVBvWmXwHnkQvI7Man1SZDIla8A2fAHYKKcJx38Ja5/AqQgQzsy3u5mE8f+W1f dys1IHyR64qig+ITvak0l++V5qKZVs7RjWMkOk0UNDbHHCCWuT8cjGP4CUbg1hy6 YUpPLHAz5bQZKC70ndggY9/q3e0hlZQb8rFunFnSr3/U1uBedtU263z9JMyXg2L3 LoAru6F8C6+vxA8zxv6Hj5N4k8hgtAd+5QAwAvJASdDJAzXX/CEQy2szIuIT1SkJ eIZDjDSMU9jLWKlkJzpyCdj75kEJ2HqODCaMbTA== 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=1517180468; bh=OAozx3 4OV1ZgYMfNDu9xAXY9ZGp+8PHYhl+vH7NsSGE=; b=deP1RAN0xI5nU/83bZFnmg dOg17Y5EUaCIMwEoZCkSdfXzVUdqYGswlw/kcjuIeyXP8qMYMIxNWJ20hLmO/jjD /OFcJK1jf0Tv9WHae4vqTciT08E3fm49+O2FB9iLZl8GL+6mL/qlzQ1TwxBSHFqM rtC0Lzuglwp5Zf7ylDG3UsIaS0yJH8ZlJ99ORY7ESocjis8U1dtCEZNN8SFeKyGP iwkZLMr7CyeTCu3mo8pBRkjlW53zJrdoXWAkwXvQbruA1MUmyBcKzKy7OCqOcIiw sizTp+XNgE0vRxgspqLbhYGO3ruw/ZtrJ6WptTdVKCtT72ilAmTmATMoxnISErTg == 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=WvXNGMJl 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=WvXNGMJl 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 S1753845AbeA1XBF (ORCPT ); Sun, 28 Jan 2018 18:01:05 -0500 Received: from mail-bn3nam01on0113.outbound.protection.outlook.com ([104.47.33.113]:60480 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753533AbeA1W1t (ORCPT ); Sun, 28 Jan 2018 17:27:49 -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.14 080/100] clk: fix a panic error caused by accessing NULL pointer Thread-Topic: [PATCH AUTOSEL for 4.14 080/100] clk: fix a panic error caused by accessing NULL pointer Thread-Index: AQHTmIcXeDVGaQso/0aWtpUE/VRC9Q== Date: Sun, 28 Jan 2018 22:26:51 +0000 Message-ID: <20180128222547.7398-80-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-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;MW2PR2101MB1018;7:skQaeMbQDCdachvuiUCFyGDrz7tOosWJQStKo2r2XIMHncQ0h7ThtFGmzpHcaTrB2yVFNafo5U8xNuwrqGo88GHWCl3twfPk4+VNCrlBqEHXyKjpa24xYzu0eFtPOymJjROshholMO1BpkUb3Wtd57DpoUHPZaQfYK4Sv9C63Bupee8AVWLRv1n1picIeEvZE7XpF/dwVbbIc3VPNfMPcJml9EYdscJn+9BEyclybGAY357oiGqgVVYddfi5cLjE x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b7fc5862-fc1d-4336-0000-08d5669e5844 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1018; x-ms-traffictypediagnostic: MW2PR2101MB1018: 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)(3002001)(93006095)(93001095)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011);SRVR:MW2PR2101MB1018;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1018; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(39860400002)(366004)(346002)(376002)(199004)(189003)(53936002)(2501003)(6436002)(86362001)(6486002)(5250100002)(26005)(102836004)(6512007)(76176011)(6116002)(2900100001)(3846002)(36756003)(305945005)(7736002)(316002)(3660700001)(22452003)(3280700002)(54906003)(110136005)(99286004)(186003)(97736004)(1076002)(86612001)(81166006)(6666003)(2906002)(106356001)(14454004)(66066001)(4326008)(68736007)(5660300001)(25786009)(8936002)(10290500003)(81156014)(72206003)(107886003)(10090500001)(478600001)(2950100002)(105586002)(8676002)(6506007)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1018;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: WoaDUEQs/Lyhik9T3Qq1zk0D3py/FXNDNkrx//ouuDRCN1pUi3G5Vk0HBwtT6bq2yTOjX0WmpRSzIPIiGjLcVw== 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: b7fc5862-fc1d-4336-0000-08d5669e5844 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:51.1352 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1018 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