From patchwork Mon Aug 24 16:26:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 510160 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9FD2F140280 for ; Tue, 25 Aug 2015 02:28:06 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 7F0541A1D72 for ; Tue, 25 Aug 2015 02:28:06 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0126.outbound.protection.outlook.com [65.55.169.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id DC4511A013E for ; Tue, 25 Aug 2015 02:27:04 +1000 (AEST) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Received: from snotra.buserror.net (50.157.106.250) by BY1PR03MB1481.namprd03.prod.outlook.com (10.162.210.14) with Microsoft SMTP Server (TLS) id 15.1.243.23; Mon, 24 Aug 2015 16:26:57 +0000 From: Scott Wood To: Subject: [PATCH] powerpc/fsl_pci: Check for get_user/probe_kernel_address failure Date: Mon, 24 Aug 2015 11:26:44 -0500 Message-ID: <1440433604-1520-1-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-Originating-IP: [50.157.106.250] X-ClientProxiedBy: BLUPR17CA0066.namprd17.prod.outlook.com (25.162.85.162) To BY1PR03MB1481.namprd03.prod.outlook.com (25.162.210.14) X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1481; 2:6RvQxlO4ViyXpcCWTxzI9T/XQOm7kfpDwvNe52UOBv9xTGudZSzDagMwalTiq7v3m753pdIa5NwmOJI53eyPecQOegjTFC7PJx9eK5ZP+xeXQ/bQ5wfeOYJUdcI9PAHgKwkacNBIf71CpLzXOq+v681/g4p5Nn3/kGRK1EkcYGo=; 3:FgfLpfvOIkFwSRSZ9nAJRPmy0YdQWCoJlzAjKOju/5BMEZKJrb+yqjHyBGCwWcs/lxXEWv7cviNJ7CJ52tif1jfMhQbgGkqX4kzCvBl3HDEWg8925TnXsKBwXTg6fiEoayjC9qaDUlvE01eXvWUIrQ==; 25:2FNcSfwOisp4iUxFu33pKDZAI93f15i8r4RTLB2hOEmFxrYB9XEv0UKb7I49zJgczO+JZWEdj5rGN5y6Rdpw8Z1ZJ0WiXPdyZAU+SyBcEIOakhzph12+fE4IBTk9rCcOINu6Jz3v9Pi/9Fr1crPucp5XRJUA9k7/GbT4ZMAoj0NU01HD5mGXZOhPUdeLjl1HBiPgg/re8J1Lm+Urr12pgmeq6PPqTt9HyAgiDeIxNZxXRaHZX/VajNh206zP8nJgiZ/KYXa0WVdO7Mc1/vUlzg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1481; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1481; 20:ylAKKMZZuN0T9Y7zGjsAv5DluccJNgvYSmEVscX/27BHged3nll71jJjmr1MwhXJkRigjbVqc8UX7ktWAB6D8pgJIOErva0r6ubacvGpLlxME4raCGNHUiPwEmubwKYmhKnKAmQPyvSt42Nq+lcD2bZS2Qphp2Mtc6KrVYxG5qImzGMt+BneiqZdc7D/aVsWeZx9nqJ+1YzqlYeugY2xu5bh4e4iOUgo3PM6wiv6TC6dhe3IsGevSSUH7IYNhWt30gbVB+f2PnRIbagARLNArk+O+6Vb+kBM+1hnQzhglFQ9/RmpCAwR4LfWs70+zvFFQj/hgS5bdKbrBg0oFCJYWLU80OfRdKuLkesklyCiQsztAkn/6u6syE4Prbto7IB9enR7Vh1mjYOukzGmrtJgAqvq4DhZSzmVr42tv6vG8QUaYIflVLsYx7YggBC8INGHdN8MApcxR6/wRAJ4ACJWxndUozxGMEHM3iChcKrapW03YIjlRM6CXTI+owjYPcdv; 4:b4X8gBZ6bJXJzA9nvpj89uuFwfxC/kMzYQjtfprY5EpAb0S+ug3QOvdwh91KW2zPYEP+XJm2pR37Zou25BMGWJcXNlZPz01S2JMuZhbxLSMG5hkjeXqAfZNcHJVFioFCcyH/yJu/T4AEUo5WYfH3p9ubIN/0NGomv/UReEc3ieVa3TVvQ1uR76EJcQDusiQzGKZ6WKBRE7Lgq8rwIjoR6bh5bmYLeYqIh5PHU0s9+ZfSs9NmBAJFjRwnc/nQB4/uZlzb6maYB1rsxAYcG/vmzc7P6urj0ArcBNfLCfc/7S4gIDNpw6aC/FSFEjU/UKAg X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:BY1PR03MB1481; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1481; X-Forefront-PRVS: 06780E24F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(4001540100001)(122386002)(19580405001)(97736004)(5007970100001)(46102003)(42186005)(69596002)(19580395003)(5001860100001)(5004730100002)(5001830100001)(50226001)(81156007)(87976001)(92566002)(86362001)(53416004)(62966003)(77156002)(77096005)(68736005)(101416001)(33646002)(106356001)(229853001)(105586002)(48376002)(50466002)(40100003)(5001960100002)(64706001)(5001920100001)(50986999)(36756003)(110136002)(5003940100001)(189998001)(107886002)(47776003)(2351001)(66066001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR03MB1481; H:snotra.buserror.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: freescale.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR03MB1481; 23:dewI6YjlfUMhZ0RAdHIZa8EA36JOFWTyJeRwv8Fll?= =?us-ascii?Q?AVSjftwje+FpOxpvM+nCTHG20w+AQj0GvG8EiGwvp8l8B8eT2RVaxWAirKPh?= =?us-ascii?Q?sif92UXJCy7I0LVzKcaAYRIs8vYAc6jF8gz59Dug9ReSIz70P9aUGsd4KHo7?= =?us-ascii?Q?Z+q4yn9RzqWn8PXEqjIBvLoBeKtlP7xN4w4UuTlvpSEatT81neGr1aalKTLg?= =?us-ascii?Q?AKVX7RnHXvQLi8owUhGFA/z+hnYERYS5+xrFVGj+CTHIUaRE3ke6HwNSCHNX?= =?us-ascii?Q?O9ZwS4AtHOi4FckgKyjGWb/CvaHPie/RQeADFZmijlM9ehmkh6F7XmpKuMIO?= =?us-ascii?Q?/APBbFMarQtS3wxYPtTd8sCpbU35Q7Haqgo6dntPLpfjmbJRg5O0y/kcJzW1?= =?us-ascii?Q?I9J2Z+QC5e7Y+MUizLjc48cZ6TsG7y8CIPpf9jXTiZp7bNVCawSD2yPbxu4R?= =?us-ascii?Q?1OpLtU2ePlvz4zRAhMP27LZ1ixl7Uv4TnUp38MKOYhDL7fGy4vmyI+XRTkr9?= =?us-ascii?Q?T4I0aO9mGoJXn0sYl2gHfvBdmj495fJkqsgvye12yK4rNwragk+VKO1RQABW?= =?us-ascii?Q?Ss3kwsQO/9MVTYxrkZWEhYuWCmK4U4WWZM1PrbhhcYCCGdmGhZ4+FoUeUMij?= =?us-ascii?Q?VA/O01Bz96Kot0hixQv9l97fFLVscEAWg6S58RMJe4q74Q0AcxggiRBVKePo?= =?us-ascii?Q?4/o+0bRm1Uiey+lqz6LQDKFrOZdHi7RCuHlDEyDiajVi0QKhSoNXT57CIedj?= =?us-ascii?Q?cR/Wtyi463W7oZqB2vBYNkbmSAAkMBuKD7EeMndvjE12kNATwzdUcyeDjiba?= =?us-ascii?Q?FXQhGLhl4RwWSDUjBKjP0hrPQt359Suu9UFoYbzvY+ROxhmI5+UMxu0PZihr?= =?us-ascii?Q?tkYklOqg+xFZnJrjDeouU+ns250YN43ZgPGA+ksDP3XvJQHedmzW992GNjt5?= =?us-ascii?Q?0yWZ6hQtrIEgNZYjwQlRI1cH0B/m6qo0wFTogCWKU9IHn4/jesVW1kq6MIkj?= =?us-ascii?Q?tMstOCopdYGfaariXi3kW7puO4SdKveHgSRAXBBAD/w6JTSbIXo5AeYBVGsC?= =?us-ascii?Q?o5h7ExfkbMbEn4jUk35ylt1+xLzHECNNFk+EDyk9/B/QpcLBIhmmOyKTuNr6?= =?us-ascii?Q?PpaaVf9VJR32c6zMZyaZfglGxridsJ3aXLx9/3HGKDjAmFvTZtZatOxY+LiF?= =?us-ascii?Q?/fNgQrlYCfnwUUmVGaT6+6d5purdvYpXsAs/5SAGXpffdoatUDem+7hCZDKU?= =?us-ascii?Q?G8OKwgoKDjWDmHTHa4=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1481; 5:3EXAJCSatZr0+ZCuzX06Zy49jgL+gxWDPCWgClTjT2M87XUwCG0xnt+1KUx999910ZVgrKdpq/yFk4urU9gM2Y6M51FjINskRChSuVAHIQKvXuCqu+FWQ5+fFQTdL+46zpypQCcKCTSMpP3Q6F534Q==; 24:Cn8trO72rFtp1+H4BfNwvlJ1/cF5iyMdSaCub6FE8U1kmtisnDdgLTdhG0GJeAXBhmLsayzbuWDMlDehGKAAzr7Vznxpq0mnEY7n78ogBws=; 20:Gcv99jYO9aOtEL7fQFatCTh0DOlXk+qSOLi6EVAP584DUQP2hbdJjO/biEJxQrb/PvBsZnpBGHBM2FsrAUNWAA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2015 16:26:57.0081 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1481 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Scott Wood , Andrew Morton , Hongtao Jia Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Scott Wood Reported-by: Andrew Morton Cc: Andrew Morton Cc: Benjamin Herrenschmidt Cc: Hongtao Jia --- arch/powerpc/sysdev/fsl_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index ebc1f412..5dab1fd 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -1002,7 +1002,7 @@ int fsl_pci_mcheck_exception(struct pt_regs *regs) ret = probe_kernel_address(regs->nip, inst); } - if (mcheck_handle_load(regs, inst)) { + if (ret && mcheck_handle_load(regs, inst)) { regs->nip += 4; return 1; }