From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517179252-2-17203325268205347752 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=1517179251; b=UiVP4r07vRVthPdU4Kpo5SNz4tLATDofnZaoalzgBitMD/9 KlEiNm9Lh2PyxtFBzxlI73wUtM4R5e8rJO7y6CMjEECOXQRj+pbjX1ozxG2ok+aG eIbJKpOSbGoj3HVe5Gu542JAqo1nu8cAV759ix0Uk/C3Fa6ITFuIniq/6oQKRyDo MSKn5S1Sf2J5fhWSKV14m7D0CcCjrcrpSH9SwCRgOP3HDCcfX3hqd1O8+JFODg+k WIEb5UABGcKJoaLdwL2SqIJ+XfnuDjU55Jcak1RHSdIgcAt9DIZx4+WFH8RsehD2 TxCtygS7wVoi+YWn0e1Gy74vS509nlpLIR0ayfg== 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=1517179251; bh=OAozx3 4OV1ZgYMfNDu9xAXY9ZGp+8PHYhl+vH7NsSGE=; b=JywzV7JBlHAQu6hPWnS0zs UI8oKqBcyrwN97JGdvK3mShuOJZAhrr2JMTTb4TuSHHQfaZV+pkblkZbQthx2HmE WkU1QTjt9fnEZCqQ9RntaEZqnit7xTfH+eNJI+H+zlM+Kc0gtJCviSU4DskeSTE5 ZBQU0VWqHzOp569GZCU25ZmD5ey0oJ8wLj+zEq2/GIeNcOGHeaVzj7haeOZ7m+sr YVAS4MaVuTtt/07MMxbyqkIJOYbhdb1c+e6mJcIJGk8Z2RSMn7zCf+ahnVdq7g3J PaZOE+z0c+aRp52Ou/E202hhV2KnQ0SXx6T9fiG/YOG76edcUMRFkkzq39panyDg == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=LzJe7OXZ 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: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=LzJe7OXZ 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 S1751941AbeA1Wks (ORCPT ); Sun, 28 Jan 2018 17:40:48 -0500 Received: from mail-cys01nam02on0124.outbound.protection.outlook.com ([104.47.37.124]:11968 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932448AbeA1W35 (ORCPT ); Sun, 28 Jan 2018 17:29:57 -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.4 26/36] clk: fix a panic error caused by accessing NULL pointer Thread-Topic: [PATCH AUTOSEL for 4.4 26/36] clk: fix a panic error caused by accessing NULL pointer Thread-Index: AQHTmIdZPbuLHpglPUm5g79oVfuOAQ== Date: Sun, 28 Jan 2018 22:28:41 +0000 Message-ID: <20180128222815.29479-26-alexander.levin@microsoft.com> References: <20180128222815.29479-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222815.29479-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;MW2PR2101MB1114;7:8DfqS60OHPPJo3ux3d/zbH4Bdm1iosJPzJEzdMNR+6myieSqpjB29HfDQ93zZrmiNnRUe8xo599N9gN/rfLAtvJBscRhxFMyqB5jcBPBD06wYHVA9IpGW9mTF6bumaG29vZtKsT/fYigAkQ9mAb4vKYQVA5VXaBMoJQZniU9p4prGIb4ay0j1N9hDr9mIGmi8pcmKz1KigIwPgBWpd3Ds739TqFTP1W9ITFpd8UBgXspTM9WLfaF1mRJdzuB6uT8 x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 959ff067-f765-476c-61da-08d5669ea66e x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1114; x-ms-traffictypediagnostic: MW2PR2101MB1114: 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:MW2PR2101MB1114;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1114; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(39380400002)(39860400002)(346002)(366004)(189003)(199004)(305945005)(186003)(110136005)(26005)(81156014)(7736002)(8936002)(6506007)(102836004)(81166006)(6116002)(3846002)(316002)(1076002)(6486002)(6436002)(105586002)(22452003)(72206003)(3660700001)(2950100002)(14454004)(107886003)(6666003)(10290500003)(99286004)(68736007)(2906002)(97736004)(478600001)(3280700002)(76176011)(8676002)(54906003)(86612001)(10090500001)(36756003)(86362001)(2900100001)(5660300001)(25786009)(4326008)(5250100002)(6512007)(53936002)(106356001)(2501003)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1114;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: mvRMG4WAJR60BRQj9OYOEJU6Vi8U7arYlsEm1pZz8M2J3cdVR1bnONX5r6zfKEyAUwYEhcvPqLnixBDvwDmGPg== 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: 959ff067-f765-476c-61da-08d5669ea66e X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:41.8839 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1114 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