From patchwork Tue Jun 5 01:46:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rex Zhu X-Patchwork-Id: 925278 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="QCvLE+hD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 410F6s6nCcz9rxs for ; Tue, 5 Jun 2018 11:47:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751295AbeFEBrc (ORCPT ); Mon, 4 Jun 2018 21:47:32 -0400 Received: from mail-sn1nam02on0068.outbound.protection.outlook.com ([104.47.36.68]:45184 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751242AbeFEBrb (ORCPT ); Mon, 4 Jun 2018 21:47:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gjdHMZKH9JgMTWk4gisAV7wrfskBz0xkONM2ymwx8uo=; b=QCvLE+hDeylNGVe7tWC4sdDzzBLQyLFNaECZNjG44Ojy5ErXOk5n3AHlGiEg+tj4tBfzYHzbM2e3rpahNZCxktMtL/dkQN19I40SauXIwqDqmnV+NBsGZivkayYJI8iPBEiMNlLdqskbk0AmyIhdyWNVavjX9UfDr/FLYCSZJO4= Received: from CY4PR12CA0039.namprd12.prod.outlook.com (2603:10b6:903:129::25) by DM3PR12MB0761.namprd12.prod.outlook.com (2a01:111:e400:5984::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.13; Tue, 5 Jun 2018 01:47:29 +0000 Received: from CO1NAM03FT056.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::205) by CY4PR12CA0039.outlook.office365.com (2603:10b6:903:129::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.820.11 via Frontend Transport; Tue, 5 Jun 2018 01:47:28 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by CO1NAM03FT056.mail.protection.outlook.com (10.152.81.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.841.10 via Frontend Transport; Tue, 5 Jun 2018 01:47:28 +0000 Received: from rexzhu.amd.com (10.34.1.3) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.382.0; Mon, 4 Jun 2018 20:47:27 -0500 From: Rex Zhu To: , , , CC: Rex Zhu Subject: [PATCH 1/2] PCI: Avoid access memory outside the resource window Date: Tue, 5 Jun 2018 09:46:45 +0800 Message-ID: <1528163206-4136-1-git-send-email-Rex.Zhu@amd.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(376002)(39860400002)(39380400002)(396003)(2980300002)(428003)(189003)(199004)(104016004)(16586007)(110136005)(316002)(97736004)(53936002)(106466001)(4326008)(105586002)(5660300001)(2906002)(48376002)(476003)(2616005)(126002)(47776003)(7696005)(86362001)(36756003)(6666003)(426003)(50466002)(336012)(81166006)(68736007)(81156014)(8676002)(51416003)(2201001)(356003)(59450400001)(305945005)(77096007)(26005)(50226002)(186003)(478600001)(486006)(72206003)(8936002)(53416004); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR12MB0761; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT056; 1:Mj9CqiVm+t1d0jNparcaXS69W6wXNHpPaMt7D6rHGWk7cDQfng6Pufecv88t4WkRFW6g6yAev6Z55ITXgha6bFTKL8IrSAJuwvRNlPwm/9IW4QQCET5133Vigr5mj8z9 X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:DM3PR12MB0761; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0761; 3:FE8Y4S3EhMDFu+fNFM3caMSe4QhOv0ILTw4Vx1qayLgbSs83dbMpomBcYbHCpUhYFEBb0C0tEoELH64Xkot80a7oB+TKKyyd4e2+01cAizsp7jPk5ANTchY0ASGokrT+0yj0rC0/7RD0QWRozujVitd1/zbDpQUZgywrxaZcoZgdcHRbJp7qktbKLA2Sf25TExs2rL/lCMvQeJ8Kc+RASRwKY+NnCLr0c3+/1Qe0pYUB+YjZ4KgpJ20J86xlHB330vxPIn9gBoKEUqinRz+0/eZlHDKUZ02fElViqBAzQ605i1FIWwMDbpI9vVC2RZvckjPqAAEyWFK7QrWwmhZxa10W3HWYGTGZLBTkd4/oNaE=; 25:SqimA97cKUEiZAhWD4ZQR5LAowOYHUvE1Oq7yVPbHmMKdV04+A6wZ6CzjzjYdKy8nnGD6laKuOj1QhLjyddEYgzYGB4Iu4GlXo+VFRgcgE4KpLa+wOLRIWNWpCKfuJxdBiVXnlyT8stDJoyQwTfSr+m2BmYmZMbTJSdei8KmSqKRdKQQ3Zruq1jX8xutETMv3sbK+T9z2HXW77oMt70TH6YjwN6QavD+1zKIAXxiXbcxkfLySPWL31kWaG5jM24hifzDAC0mPNtmQRWgD9NdMbtFUS7xw2p3NKQ830pt2aO5UXLhnbmduNfj8Q2EyM3GsB+cOOkAP5H1MLnk+0DuiA== X-MS-TrafficTypeDiagnostic: DM3PR12MB0761: X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0761; 31:BhLMN6YrzFo+MYcVnJ5y3HsVRBXXsryHc7w7Z03cmXMjqVLMHpuFZ4opy8R2Tmg9s6wU1fgotM+oLrEVauS8Mx2YqJYwNKNO75xWRpMhwyiUWzcQTbZ3i1Gp4RchtwpD2sJMpn8x7AfcsHhOAzWsm+9smjUrvEaCISRBsO1qpLi78pM5DKx07A7epCP9eGbgSD+naQ9MV01lNa7R7tY8uTGDPwwAi53QuWaCjhOtC3Y=; 20:trpt34e7ArZVwo3/PGoMMlqvc3csIfykEjarrw16dKCHu/8ZTJlzHBDvUNSL8esfiyX/AqbQe6N0qrZGQYvTb+4hUhPOT0BNtnefpTooWOUqnhrnIkNvCISXAeFw2KxH5fUnQKaVkSk7D0QIZwfCP68YIv6UxxPg8SkHua+WKQzn46EILt7DJW5jy8A8QYp5bWE9NPX9gGTiIklx0xZoBtlHLaGNHlX1N/LrFBzQhqcT85gFPVYHwAZXNLFSTWze6ho/UeNHAf/3ftabN8J1CYegVR8bReYXtHYpcU7x0dACfrdl20w5zAOv4r9WwjOBOwFadOta1ThzybfphT19HDFlWE8Bd8fRpmP2tVciuiKnUaC8YI46neDAC7gPPKp/QwILBHBiFmnTm139cMur2ZbNS5z48DkXNlCqI1rUwhq2w8gsLL1evhfYG0v+kEbyoywim14pqdDYNeGeepFfqEP03MhRyiFLrPqHwdSX8i/ra32kynFvkFzNaxOx6Q5c X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231254)(944501410)(52105095)(10201501046)(93006095)(93003095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM3PR12MB0761; BCL:0; PCL:0; RULEID:; SRVR:DM3PR12MB0761; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0761; 4:gM0VM74jvMDreRY0wYcrY9PvtfVhc70vX3vpZM1JgRGxyadyCi2QppmV0EYLtsSaj8YaaIHn5kWkoSMMAaV7xp4yVugJ7KftsLKimm0665/+X6sNVHjR7aSlHiNfRwwueZSN10jzxOFhFtmuyV45O5OKmrTUdXayrTw0o0XqxU+k0Mxw6Kh5hBA0tI40Gdr686N11SflbMPGBP+RG5iIBqteMFofZtV/0p3jubim4KReHeCL+Viag2t/1bxprLdrbopLxVJB9Ond2ri1SBTKmUjCiq7EcB/e87ECTxjmH/HOusTxsYUjJIvrkdODZp3n X-Forefront-PRVS: 0694C54398 X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0761; 23:Lj8zhmG6OZ9UZqPTkJGM9mxHCrInsdzOzBRXkveKZIPa8NumncP1tRGzWvP6vNbpNI9pucGQwNzTXvn9EP+B7kVJHNACZ1MGwTWvxHNP3gSuyRSgASmJ3TpA7vavmxsZhNUy6pBbdqs2y6ryEC/OM1XK0Ds+FgQSXkkbZfOjbjGFYImBkbV5qs/4gUBKN+aeLSc81Urn02SQOMZNeGVwNm2qbR4Uq3Ag6MGCNrMucNiSW6ed0Kk8gnGM3L+QqIBncSVRgloa7knySky3KKhx1Jf44/ljIqr2LGXEkr06TpdNkjFVVr6x4F5Z1knt681jyTApHdnlukSdpSSGlMBz4hM9CuZNv17cxHkVfJ4zcUCBiadvz8fRi9t0Ml3CcG8IhHCNHI4MlgomQEUz2PnoyLHdwhV/Wv36+g4ZzxepUkeecGbQNr/hQQcRZA5c1i7PxkrhNA8hMxDiGbvh4HnvPDOFdzlZZcGQJsVlK/MVm/8L6OPi3XD8EwZ6YmvPiBGJwAAoPpKVrIKUV7hUFI8FkkrvSDxfsZifqJ1AMoAASMmwPUAENv7Oi66X6iGqX5aNub5zK4aMdxODdevGySax49/2LlKuAS+lDDqlrXv3o0qbjOZiB/jUuBd9FNbbmj7leI57Q42h7stQfyM/rc49q8aEbMsPYmUn5PjqV4OZ7KkDi2dw6nfRZMUhLbriyN1meZmdFzcaqoqil1hg40y19OGbdLTnRLdwp8nWIqCA2D520S9DNtEB6hKoDaVq7zf28WQv2v5lakRhaayCurTYKl3GCsa9Mu0sfSLlDIKWPu6+7LqoreSLj3zZEESzy1WGkv1GX0Z7+so98I2lZoz4HDKPeMBPnwXmxuTPL19e2AY+RXYi4yVsRtbQT4VUrcj74waTd1yQOBeQllj8nlZ8da+KxnoCdO5gXA1S17qPzck+RNr0asbto53yV5eb2KZL/XRsAKzvCtFQk8TTYnLW3qJMyZ91gFUfSgKA5ikT215mgVMoUBwvurO9NdDYIbS3rQcsWJ9ndKSSE6oX89uxfR9AzQr4lEr0wDQ76y88pBzhEaTFJayB/6AY8YPoTdyUjE7vd2ce9KYPladNPCvvwga5asIBTWdl/Au+A0azyA73WngMfs8fIhw07LdWKL8m X-Microsoft-Antispam-Message-Info: ZIeWTWcd2nlf9D5syBZAPosQxEguAqvBwNpJkBay7WJozDrwVcTNREeKSSuC7re0qVABfFTLysOIm8xzJPMZzjC6oUlnjEbuDZ+uFc+kN5S2p/iWq64Xdx0445gJJvKcD81XS+KHvOzy8fBv+jMEY2eApztusjxkslhV/8O/dHnOtcjHIqb2QHrhBQEpL1Of X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0761; 6:XTIxuGDup+D8/IvRubDkAbisxOC6cRLV4R6UiOrEII+x8IhJVC8yLQR9DSKLLkLCQiOm+UVbArSrrJThkTdjKU2ljfE49MctZYXpzIslMmPNrF2FaPLKGM+YT+pVeVAgEE6jtE60WdCAlmb1/jPRZ3hOf/RPSSxpVhOJRVU5YNt2kPiNsLifat/g9GnmKR5y9UKSkMhqpSzLfTdZRpRmp0rdKb8csf60NRIus1+rdmEDOGPBFzMipnz+IV7CaqkRvXdPnKkDF+ikAJiSlGJIxuAEhtVFjqNrjZNGu2P2y7Hz6og5VbB1AfCqJg3z25TP99GsYhuAaVDnf3iKzrOmCcR4lAl4rE7eFbRShqqvxQI/VZBSXO3mbCN1qEZ5VxWqGznUxGxG6TamZPaGPP9qMGqQqrcHVPG6vF/ClkHLsfMW3ChfaZAt3yvfqODHJ4H4cBo0RLGEkcTiYBZk7smBEg==; 5:7Eoy9xE4eBYLI3/YSjXv0mY0acgM5PJjjn5SC+BnGQp5MLW65aB94lpju55JVs9iBM63b/gPH1COrWkZBIA+LTgV8d+nSoMi/veLxWg/PNOwyM4gvxUsW+GyMHwg+zUHeR/qVucc6U4/gi84KOks8IiOelvXSpFnTrKXN9k9otQ=; 24:1awor8HY1C+PT32+L7HNwgnbCmTvBNlSlzBwfnE1vdjvo76ExO6qYgOG35N3hLWw/Y1kC4nho09wsVnRITkP/tkIHN35o7xwNDX51mQtUto= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0761; 7:jeTCuk5F3vZ5aNBS96JveGNXJTxa5knV+kDV6gWW2lpoxsYypd9Je44t7kMEFddW4WvMv7hWVrlW5CIb23jdt1K7jdN1PiQ2j4fImsOJTLwK+0m/y49n/0iMNQgO77Jn76z86AI1+qxFzvs3QDOlMEbCysl7kex8crwfqt9CUdzvq7cyZQXyV9L0WLRiAW2K3ti0L5RiBbknCo2JvLHhxLoUzVJ206ON2sgcxaqsAwHGFx0+SVkxQS99Ilu4/IYa; 20:rt2LzhZePtHhw8yTl97cra5gsIttAh/CwFK2a444MmLdzfBetKA0ro6la9PxOIy2CQjcbxNXf6rATVxzl+1AcFnv5fQTuQTdXhbazh0zyKBwQ3rdIxSIpOitLKpDiPKiPhUUPQvBOYHJsOrJgLGYcxJVUX3OMIzRSOsnPRxWV3Z0cYppOTuvg2oJtVj6gIfwuYJjXinEwxpTD10K0AE/syV6DJR/zCfzY+EsqRDoqSOMkWR2MPMIog9xJN3yMSsn X-MS-Office365-Filtering-Correlation-Id: f4c7e2ef-86a2-4870-32d4-08d5ca864bac X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 01:47:28.2891 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f4c7e2ef-86a2-4870-32d4-08d5ca864bac X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB0761 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org change ">" to ">=" to avoid access beyond the actual length of io memory. Signed-off-by: Rex Zhu Reviewed-by: Alex Deucher --- drivers/pci/rom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c index 374a334..a5c6016 100644 --- a/drivers/pci/rom.c +++ b/drivers/pci/rom.c @@ -108,7 +108,7 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size) length = readw(pds + 16); image += length * 512; /* Avoid iterating through memory outside the resource window */ - if (image > rom + size) + if (image >= rom + size) break; } while (length && !last_image);