From patchwork Mon Aug 24 16:43:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 510176 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 [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 23CEF140280 for ; Tue, 25 Aug 2015 02:44:17 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 09DCE1A1DFD for ; Tue, 25 Aug 2015 02:44:17 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0113.outbound.protection.outlook.com [207.46.100.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id E37411A013E for ; Tue, 25 Aug 2015 02:43:17 +1000 (AEST) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Received: from snotra.buserror.net (50.157.106.250) by BY1PR03MB1482.namprd03.prod.outlook.com (10.162.210.140) with Microsoft SMTP Server (TLS) id 15.1.231.21; Mon, 24 Aug 2015 16:43:10 +0000 From: Scott Wood To: Subject: [PATCH v2] powerpc/fsl_pci: Check for get_user/probe_kernel_address failure Date: Mon, 24 Aug 2015 11:43:03 -0500 Message-ID: <1440434583-30543-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: CY1PR12CA0010.namprd12.prod.outlook.com (25.160.137.20) To BY1PR03MB1482.namprd03.prod.outlook.com (25.162.210.140) X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1482; 2:fa/UHNQsd6BD1oSX26tr4DWTqoH4mDE7NghMpf8OGo6o70j6JQaJg/HE1F3LT7zohNdmM6d3pS0IT2g2feFun4zyojxZVR/36KYazP4cwst4Inz/Qcsay1PCIBVMtktKkjFpt5Pme23S9oMsP/JWakB2qD5BULi2paN2DH17Dd0=; 3:RQC9QDSJPYVcqQk4CWENb22ZZ4eKURLXd1KaXCqDtNumA4pd6NYrNFotRBB40rOvmqtkd4NtM/x/fzt0WmVEIMEs6P96uqaYa0nOX8FMNez3XBpe362QHqi9uBLa8Wn5QZwVBJvHKP1YqWri4XwMkw==; 25:mG/5dlLZ6NsV2rd6pTX/+qN6gumNe3seeqDztlf844fqytpbi6da9TPotvlipcy2Z9AGDTyJW1INHXBnI2s64ZtjqSaJJDxdq5bjR9WZuwNSomiKM0iC4SfpaMSmCZKRZBs8dLLuCrieexck/hqPKBeFq04zv2HqH7z073WHLC07mVxbEChkNSz/WUu0KoJB8UdPUqMR9QUQWXJsG8YFZmEEhbjXcm/Y8kVw5Fd7Oq6KzJor+6Vq2tV3pB0c84qWRPUDw6BpHR/3sArk11XWJA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1482; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1482; 20:5wcMHPZQOxd27P098eEFLFEYq9MGgC3CrEVilSQuKEnsXlX1Pw1NOwDAnlHAO5w3gyQHCqj5Ufx8YRNOdD9OMbj18Aj6DAijbHNSfCAxkZ8PlrnHhaJZBcRr8zJJgDsDFJjbJ7PoYE7XjC0KBWXSfoCL7pU6L7QJ6lLbDwS+TooeiezBm8n5PylEJ1OtXqtwx5AxvnkbCn2BPyIimX7ZN69Jfo5N3ysh6xmM0JwXzOTfIum3/7uvGw8CQDhFV7LY8DKMeExoIz27VTKo/HHmRxbOIJ85Lm6yi3ccbd1ziPmwdM/moV6ObUDZhjYFrkczDLTahb4fzgpc2Iq/JXIsakQ9Iut54x+W8cRGpM3SvrMEkg4y7osvmVIJ6wLmgohTlaAF4EenCkJY5FeL3qTnO29YIsyTYb47rAQaFcOf+9omrR5QWPDOxHpjUZv2kJ2lxCYUuPwzyEMRBtg7ZcUy7w8i9D2l6maswENYwz8xTTBFvJlEEBI/rTMKSK/NPCIb; 4:bipw9pkt+CApAdTKC65V1/B4q7uPpMlY8Ul+YVjZeO09Zs8ldiswylO7RhFyxYMfL2hhHoIKAdY3OurKl5meXQ+6H02vU6bvvNfdEFAi9Yey4f4idTJjdTm20O3w3HLvfnTF5ytSyMTTzkkCjUx/qd1uBUeYJyyOppt4fDKsdEa0DPFcHRZIDdN54/KTIAfwN0Iu30JXsX8ECW88GPKZ6pWvhHpdllqsRaIel3BpdkbHQw6ewXbqNLxTiQ0BbJ1N+A3KlIr3fal13/A6myEL9V/sHh+pSwktbvziFDEw0N5rb4nJGpzGF3LQuNbin+1g X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(5005006)(3002001); SRVR:BY1PR03MB1482; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1482; X-Forefront-PRVS: 06780E24F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(33646002)(46102003)(47776003)(50466002)(42186005)(86362001)(105586002)(53416004)(69596002)(189998001)(229853001)(36756003)(97736004)(87976001)(107886002)(5001860100001)(5001960100002)(4001540100001)(2351001)(110136002)(64706001)(66066001)(81156007)(5001830100001)(77156002)(62966003)(50226001)(48376002)(5007970100001)(5004730100002)(40100003)(5003940100001)(50986999)(122386002)(92566002)(19580405001)(19580395003)(106356001)(68736005)(101416001)(77096005)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR03MB1482; 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; BY1PR03MB1482; 23:4b4C6F2AHNskJgSi7gQ7HMeynG/6IeGFzJI1pSc1B?= =?us-ascii?Q?aE8/RfT3hgA5hAC/l4oA24mulWb3eEpa+k2vYXonqkmcPRhoz66ZOh8AajG2?= =?us-ascii?Q?HUlvmrmtRFJG+zc6CG74R14wbJdUpQRTmqXD5M4cxmqwl4L43se0iX3z4aKK?= =?us-ascii?Q?LV0BW71AgTD2kLv0UusDQNiQri9bVc/h8xCla73N/d8DKPTxjZzYJaPvbD64?= =?us-ascii?Q?5I3B4PtOYk2mgm3W8wb8L6V4WPxXsg1iucjJHaG9HDAhC3vTz0B7s/JdAKvg?= =?us-ascii?Q?EWtZXIAvkfLVVTo8AjNYDon3blFb/9bA+HSbF//iBTwBej/qTErKXOgPu7C/?= =?us-ascii?Q?1USBspNl0mCNBSTlBo5X/udc7M12tn857OafKpQIHl1ZAKw3DPE6hDRT/loj?= =?us-ascii?Q?U54sOnUoV6GietvcZl4qbPlYtUaxHv2DJflRCMhXUZJ05xr9xXqdi/x3tyLF?= =?us-ascii?Q?SR5oJOjiLfrhyU5eKWlxuUFt6Ni7wiyMEZuErAoYREm71FkXGnSR8GzbwBGN?= =?us-ascii?Q?GEaJzmNwVvjLvKmQq9ZN1bHetCtu7w80Fz4a+Z5DNGtQtR8YDt3cilFOPYX7?= =?us-ascii?Q?mmulpVKKQnKPcZZU+xM7Vt2JiCX3RqL4ry5bjtolulLEj9RJ8jiGw9Ztgosw?= =?us-ascii?Q?+hvMXmROnAckgWMydhLs7vI2OyedSnZRhqjhllZXD3E4sdXkr8plWUFblQje?= =?us-ascii?Q?KXGj3jajJC2fTA18M115Ho/9Mdv9oDM60iRQolhvbR6oOu4JtjnvDhRYnLN5?= =?us-ascii?Q?c8ecQzsjbUMEpSOwXnd6AvYtWANVxv60eNfe9Ntt5z0X3dwG5iyr+qaBAOl8?= =?us-ascii?Q?m+V56ehAkSVLIYN5LS8tliPp7xQO720KK+NivM/qUWRtwDypM+3sF4ResIQn?= =?us-ascii?Q?W+FVyKZPvT43l3GJ8Yk0/Oly8oSFdhxyeyUEO9YR/Q95ekQRs7YYQw3CNEOK?= =?us-ascii?Q?2L1vtXXQiuAoPfDFpqDtnZ1DdlikwhOxiHylS/CNTNqZcyWxQn9mzNj9D/WY?= =?us-ascii?Q?Afw2V4jEMskS3PaphD0pGjS/lC3rHAtGnLLUiILX9OePPwTiwvyFcyralD1N?= =?us-ascii?Q?nffgEjaEVa1gycG4NyoA/Wsm5168AYPXozktcHoyQa3gXX/Ddx5PNjhQ+bj3?= =?us-ascii?Q?6t3X+3sa19fS8Oa41/E2FS2NcR92wbSb3LuHt7oIzdw3tYbsSv2mtPTsUTDb?= =?us-ascii?Q?aDpDu9CYUzO11iWr0OlYMRC+XkTBKJNwpTESVOhrAJCfrRWm7FqGGrg8w=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1482; 5:cQr/sVR0YGsYZIeH2xM3xm5j5vgIy48Tx1jvykPNEoefjKifIFkeoNHhhJFCZx4fanBPylFCn2H0cGH3WcG7wyPpp3hs2YWCuy32J45tCSrTH6+FcMqqa3yxOAxWx9cwkdIrqXUh5QXQ0rzSUqcShA==; 24:7JA6xHA+IGQDkaKDX0iszUqK7lfXDM6uuo+jbroJZU4GTwkrGfXSv0t++X2bjrQOlxSoAUbeQKmuQBQ3bsjwQg05j4ib74O63UYBsrwvMns=; 20:JyO76vNadmh11SxrAc1kr4vBjbAlLmbr2lCzeI8wW0krE95eVNWUhqgUR1G3/znsknytFYw6MINXtxQyTfzo+Q== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2015 16:43:10.4295 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1482 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 --- v2: s/ret/!ret/ 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..c42609d 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; }