From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3099569-1517231437-2-5133095881135672520 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, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' 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=1517231437; b=Zo8DiBHtGUs7i6QWdpCc7Bo9I1GLwRPHvUopP5T5GlWJDqH WRE57Pxzgx1P9s12oZJ6TQLJBqUndjFHTm6xPbMCbOkfIGXxwQjxmOjYECRmDK1c uzS/dd44gHM5yf4mQQr3z/v0ZbkX/SxjKZ+Bf5XkC9Fe7g0IysH8IetOYjcM+rBh Kl9lDD/VCfxnsyFXBrFMZVWLiGXM+MUdFkCMRPyjWjZCLptS2y//POXundB+BDgK 4m3mgOfd5EdQIqrIUCOJuKvFG1D2yPwOXlvopiB3jD4go5tKtevK5bTtgLqxKoF7 vji0TxHPba61FkBXiLd9OGairbklnnwT2p1ew3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=arctest; t=1517231437; bh=rS66PtzxmCllBAyxkCMN6ZxFS6 xkeTXuMLLrPfPL6TU=; b=M9D6Dl01Xh+9KeCyrYi31ugCeqWNutTgJ4dTe8HjGH +cInj9Xu2o43h4ixYTzXgyzfWDoMevSUOJ82O8RGs1h8pYJYNmXLQtQNCZjEy58U YC/LMcLj7kBrmimDeorN72fLcuqk/tY+UY9FAPOOlJ8jN31mylbcNw1FQ4q9kuWw lDYZisxk8rwgv8H0KX5O0rDU10E1UkDSSMQ6+ogY4Ln6hvMKAxhJaNkfWve+ByQt 7LPYUmrvaeMKZri/MbueHNkZs0rnbYsPepJvMBVM9Ps//5t7zCFAOaRxI8avCLxm Wck/7ELCSocEGt+BW9cUSyYrwVfCusphMCbV+KBKDdrg== ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; 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=linuxfoundation.org header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; 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=linuxfoundation.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751835AbeA2NKf (ORCPT ); Mon, 29 Jan 2018 08:10:35 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:42696 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751740AbeA2NKf (ORCPT ); Mon, 29 Jan 2018 08:10:35 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiao Liang , Thomas Gleixner Subject: [PATCH 4.14 60/71] perf/x86/amd/power: Do not load AMD power module on !AMD platforms Date: Mon, 29 Jan 2018 13:57:28 +0100 Message-Id: <20180129123831.617525907@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123827.271171825@linuxfoundation.org> References: <20180129123827.271171825@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xiao Liang commit 40d4071ce2d20840d224b4a77b5dc6f752c9ab15 upstream. The AMD power module can be loaded on non AMD platforms, but unload fails with the following Oops: BUG: unable to handle kernel NULL pointer dereference at (null) IP: __list_del_entry_valid+0x29/0x90 Call Trace: perf_pmu_unregister+0x25/0xf0 amd_power_pmu_exit+0x1c/0xd23 [power] SyS_delete_module+0x1a8/0x2b0 ? exit_to_usermode_loop+0x8f/0xb0 entry_SYSCALL_64_fastpath+0x20/0x83 Return -ENODEV instead of 0 from the module init function if the CPU does not match. Fixes: c7ab62bfbe0e ("perf/x86/amd/power: Add AMD accumulated power reporting mechanism") Signed-off-by: Xiao Liang Signed-off-by: Thomas Gleixner Link: https://lkml.kernel.org/r/20180122061252.6394-1-xiliang@redhat.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/events/amd/power.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/events/amd/power.c +++ b/arch/x86/events/amd/power.c @@ -277,7 +277,7 @@ static int __init amd_power_pmu_init(voi int ret; if (!x86_match_cpu(cpu_match)) - return 0; + return -ENODEV; if (!boot_cpu_has(X86_FEATURE_ACC_POWER)) return -ENODEV;