From patchwork Thu May 21 13:26:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Laurentiu X-Patchwork-Id: 475041 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3091414018C for ; Thu, 21 May 2015 23:43:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755900AbbEUNnc (ORCPT ); Thu, 21 May 2015 09:43:32 -0400 Received: from mail-bl2on0142.outbound.protection.outlook.com ([65.55.169.142]:49952 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755551AbbEUNnb (ORCPT ); Thu, 21 May 2015 09:43:31 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Laurentiu.Tudor@freescale.com; Received: from [10.171.73.193] (192.88.166.1) by BL2PR03MB305.namprd03.prod.outlook.com (10.141.68.13) with Microsoft SMTP Server (TLS) id 15.1.166.22; Thu, 21 May 2015 13:28:07 +0000 Message-ID: <555DDD23.1010903@freescale.com> Date: Thu, 21 May 2015 16:26:59 +0300 From: Laurentiu Tudor User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.7.0 MIME-Version: 1.0 To: , Alexander Graf CC: Laurentiu Tudor , Mihai Caraman , Scott Wood , Subject: [PATCH] KVM: PPC: check for lookup_linux_ptep() returning NULL X-Originating-IP: [192.88.166.1] X-ClientProxiedBy: DB4PR05CA0006.eurprd05.prod.outlook.com (25.160.40.16) To BL2PR03MB305.namprd03.prod.outlook.com (10.141.68.13) X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB305; 2:mZphsYf8RD5K0KPjJM4uTwKq4iVd2KX4JFOInWzpK4hXAtNbl+cq5E6wzHD3bN4F; 2:rFLaDvuNWDMb2Jw9be3dVOiofQdLYKdf3cv6dkA1I5euIPd+RTO+gSeif39tHQdlblwG/cO22R3+2X8SD+8qKZER0WKw3EZbsK87rFuhbHz2npIH7OHQYwk8hlSvbKkkSM3it3p7zWsaKZ0fqS9o5w==; 6:6ZnHN46sZuB+BOsuRvy19BxrZPx0zU0XPk0vh0E4X+URgK3T4TJCygnz+OAluevOg1wFl6xwqvN8yWPlAvQ84EzAqXys/l9D9/Wjjk7mwB3p9WCP/59mMqGIjTJ43vr6m83hNuv97ThHuaqLtZs+d1wsy9p6qLjLqUBoV5z46aLjKxzq7YDzFDPtF0vuKpz2vhYCtsRe8AKm+6aYNA+ykR4uXWA6/tGqAo7Dq5pWmedmpqAu+9H4BDug7m3UNfIZ3iCttwRA3Hi73dIO7XUux3gcITCdCPTt6tzm6Ah6otSkbdonQR44rVnKWivLG/g/Mmqe6WwYgYXxdGxN5nOJAeOih+Q+A6x2vUfOrjoGEu4nX014zs2dpEkC0DEb7yc7Vs25TTZj5Y1aQNmspscrDHnMu/pQVynjR26Czt9WT7wX6EHuXmExlnsVEZVw1VO+cOqINwZJRj208iLa4Y/n7ECbixxKHEUXzhPfrHkCDJDpizn91j8G/HG1epG7CoCZpYZ2dgBjJtlwoRcong1qbYFK6zdcI98IWuP2gWjsvUpJTeeZ58fXtfXIKgjBXGgXgQpXmyfG3/nRSKKnfZjB7Ub0p6amJEOAzipuZ+tBcTM= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB305; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BL2PR03MB305; BCL:0; PCL:0; RULEID:; SRVR:BL2PR03MB305; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB305; 3:CNj5ZpuOXIR3mFgLF2+nA0yZ2+OQsfIYiX/orUCiE9UpGo2tFJHKgUbtjEG70LW6FRo6htjUmYOqf5eiwiFxAXq3zS5v2w7V2LYGe6XlGMjeA/RVY5sBfP9pAGuW/bgv2JGFVA86/2kesoj9sn5a7XcxF11iZlrgHj0W/F+EiREXUo8mWUMUnwdGfzWIVHQtihUHk8tcXPb57HfMTglS3/ySs8dF7VX+e+PAsdfPub9T9Oqoyr0jHITUW3+RREKIRPbxqgGXHBeApWRhSXr75/LYHa3XjGWtB/pafB6exhk= X-Forefront-PRVS: 0583A86C08 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6049001)(6009001)(199003)(189002)(42186005)(87976001)(64706001)(64126003)(23756003)(65956001)(66066001)(33656002)(65806001)(229853001)(40100003)(47776003)(46102003)(83506001)(54356999)(87266999)(106356001)(50986999)(36756003)(105586002)(15975445007)(77096005)(68736005)(101416001)(19580405001)(80316001)(65816999)(19580395003)(92566002)(50466002)(59896002)(189998001)(62966003)(77156002)(122386002)(5001860100001)(81156007)(5001830100001)(5001770100001)(5001920100001)(4001540100001)(4001350100001)(97736004)(5001960100002)(61793002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BL2PR03MB305; H:[10.171.73.193]; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: freescale.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?iso-8859-1?Q?1; BL2PR03MB305; 9:VFFcgEHQjaCpTxbNtRLPQuzqBpsE7m2na1t3uP24c?= =?iso-8859-1?Q?e/AYihLCnCrBDe0d/0bLoG5m3o+n+S3juiRpK799kk7NONnAxG5Nkq5Ow2?= =?iso-8859-1?Q?vYllklfFgEgPWMTY6kbaN/KKAg9jSuq+HCjxAewUErD5IWd+tdpVZCKWdo?= =?iso-8859-1?Q?qck7vGjVmt/pJzTY2oZYySoqO/Q96Hb3YueFYbQrq/gFOrKwX3nvuthGjg?= =?iso-8859-1?Q?70sBkgTnl1oBnZr1tdxYPwiJH8OVkZTr1cHh3Zjp1o6HaAdzEviP8ErQ80?= =?iso-8859-1?Q?bdD8OykfiQ57vbWN88UClh5+5+PtPUgowptYNnHaTHiX1Q8k6NyWzHXt5D?= =?iso-8859-1?Q?t0X7x7zVF298Yk2+ibnMFS03dVX1lnceRJx3wT5AHQuhqv2TZBPgFcfuSC?= =?iso-8859-1?Q?NAwTLQEBfWk2Dmpf+xabQd5gQTZzNhNrAyAzJRhjxmtCATNXubYynLtbuy?= =?iso-8859-1?Q?na9QSFro6X20REbm+SVhQWbr+1z5i3mZvNlanBDWYig3/2qzzWjwT1a+gZ?= =?iso-8859-1?Q?RSWadw7nW0jaFrK86VROE+fprZCu1Q2TAH6tL1Tm1VaeZXziyHd4KMJlmt?= =?iso-8859-1?Q?ODv8ltj6ca+5tXQm6Vnwdc6YY8wEdc17PLfbOTeUBI4zPKPxF6XQlKOSCQ?= =?iso-8859-1?Q?RfJcD3TYY1O7upeWIW2IeI3m5QcdoeYYVu0Z9h9A6aALkd5fyPmOfwsEgD?= =?iso-8859-1?Q?jeA2bpDjyLjBobsmy9tF7wdu/M09BBqQc1rErdi3fwLqT/hHO6T4y/5sJS?= =?iso-8859-1?Q?5h3mNN0U6ZUzy8I2sT6uXUHcvdEQzZzh1nd39GY7vaEhXdnCGhjvLihFse?= =?iso-8859-1?Q?FK8qBlQfQoE65Co3O2Y6CCAUfPHosOcGfYZrKhz23r6io+TeXM2mtegVcS?= =?iso-8859-1?Q?EN8oFayJoviIxFO8o6rwf0HNNDs0ct986IVN4p3VFTrkUbNWMvQr8/zXu0?= =?iso-8859-1?Q?YEg3Q8IrV73uKcuTFzw2482cnrd57biNAkavBHvfZO1rLw3F0hgD5TBXA7?= =?iso-8859-1?Q?9Ybu2K6VwvuweGjSJ52atOdpCw2wvAE+sTzDBSeNb7CffvFFxzfbtcq0Rs?= =?iso-8859-1?Q?3S70UjpU47tosVet3Y22tRFGInm4OjUrZS6c5irK9DRSqEHoN0oQn+vCC6?= =?iso-8859-1?Q?n2FYdq2hq83s/CYGwEBminY8fEn3LxKRmJxu0gVOVgnUP/GI1A2hYNJLlP?= =?iso-8859-1?Q?z9efLPKTBxCpw5MmvPQljKWuMXfn5EGSL3OPTPqNYm4MfMCte9fNSrFSKg?= =?iso-8859-1?Q?mkevG10+Xz8OaJQu4C3oWkx5UpoNIaL00l0D80n+tQaJzQi1WuASGvBk2g?= =?iso-8859-1?Q?7KNq91FHWLmbfaVYJSUfhj07Fl+6+RhsYoD2I2t112ObEHXVhrkqnZrPzY?= =?iso-8859-1?Q?Z0j2PU=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB305; 3:glAjFgt/aEMje6lYHeFhgZPSz1qvaidfyFe9eeLADSaDLwswjZbII4s8DbQYW1KgZ08BMwK41xADjOPgrY+O0uWYrjreK2tv45sWhCz8rZmkx3gwKd6XETjMEJlR8jpOTZ9DWMf7jy7iYS7mPlLw/g==; 10:ISoPWe2Cc61C12xBbl6LZV9Hp+y8z9H0Mo/9mt58YPh/SckaJwiLjL9BhKJqmndCznvmG+W8bVCo3ieqk9EMfzKyIDFujOba8+b30x3AhEM=; 6:iRcib/wNt40WsHbznqmmAT8aeAVXBIjIPveGov7CMY5YGA91To8msEv/1nCcM6qZ X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2015 13:28:07.3556 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB305 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org If passed a larger page size lookup_linux_ptep() may fail, so add a check for that and bail out if that's the case. This was found with the help of a static code analysis tool. Signed-off-by: Mihai Caraman Signed-off-by: Laurentiu Tudor Cc: Scott Wood Reviewed-by: Scott Wood --- based on https://github.com/agraf/linux-2.6.git kvm-ppc-next arch/powerpc/kvm/e500_mmu_host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index cc536d4..249c816 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -469,7 +469,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, pgdir = vcpu_e500->vcpu.arch.pgdir; ptep = lookup_linux_ptep(pgdir, hva, &tsize_pages); - if (pte_present(*ptep)) + if (ptep && pte_present(*ptep)) wimg = (*ptep >> PTE_WIMGE_SHIFT) & MAS2_WIMGE_MASK; else { if (printk_ratelimit())