From patchwork Sat Jul 15 01:26:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 107837 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1642911qge; Fri, 14 Jul 2017 18:27:30 -0700 (PDT) X-Received: by 10.98.48.69 with SMTP id w66mr8111604pfw.214.1500082050422; Fri, 14 Jul 2017 18:27:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500082050; cv=none; d=google.com; s=arc-20160816; b=Ba3cBwzAJtmp6xK0ZxSwZx4yLKXPBUt7oNCxLm2N5UplUbX1q3Qa7RtlThU6/dJShy cTDbWkWLCxzk67H8ClQnAxM6cFxYpVrUla+H3iDafuGkS1oXsU7C1+JuFhiP2G5nRfM8 tKT7mYJgG+HMQk69xJwj9K/i0VJq2aFD4JK3qv8VmjDmlG5gC5oTe5LOHz8Lj2p/ynM4 yqn77WMLM6bc618ORnQqvN8tFnQNrd/83mdnUTmevz+ISSAAiB/1gafk0vgkliU3Z7/Q /g5itTIOq1/5a7Ofv7GWAWXgHx7WUdttCEmsvFpU6PjI109qKMg0NcxDfVKWRmWrrMf3 5Jbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:to:dkim-signature:cc:from :dkim-signature:arc-authentication-results; bh=/afMvCuX6I1WFDKMQtlD6pzzUcQSmhp+6IfZkJgPAEY=; b=YPxoEkAUsnpGFXLuAnTbPzdYxiVE2FN+jsKNy3yoYgAssMDrHzmrRwNI64ByZC7kNZ MImjF9UmKyC+tyXgVE62D2hI+Pq1RWcfwcbwUz0fi+3KQ6UZjvFIO48qonMWYoY5+WID 2eC9EXNQbDFf1oOpRxBZYvLg7KsSd7cFuOgFuSXHImcy3EwjtXwJtvY3NmOJtVQoK8R+ ujsmOvuw+niYPLcI5VjC13uoXUw2qGvboBe55Z+XzJ4hdDtlpf98ajV40JYeSTHEfuoc V7TwWD4nKanWAK7yZ/4c7pxxbW+RxSFr3Qm6euQaeBRL2gowfWAro1foaN+kSotcc8nm FZqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@verizon.com header.b=FxBM/302; dkim=fail header.i=@verizon.com header.b=qVHF/Vwe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d89si7605397pfl.148.2017.07.14.18.27.30; Fri, 14 Jul 2017 18:27:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@verizon.com header.b=FxBM/302; dkim=fail header.i=@verizon.com header.b=qVHF/Vwe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751688AbdGOB10 (ORCPT + 25 others); Fri, 14 Jul 2017 21:27:26 -0400 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:51562 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751338AbdGOB1I (ORCPT ); Fri, 14 Jul 2017 21:27:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1500082028; x=1531618028; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=menU+41m+/Y//DaabZ2irJfvbUS9WZd7fCEkwk2ujuQ=; b=FxBM/302YpFX1+45ifymVJIIqyx0KnCV7ngo4ANqfA5tSedGUOd/WF11 PtPvKnvbk7Cz+7QjeVMIly/95Nj8F3/cWjtY0s9jAGo+GABA3tSNn2Wwy nBchNlnJhQaRATS48mrE8iFRWHZ05DmeHLQBtfPxmFlXX/d+FUoOL+Jvz 8=; X-IronPort-Anti-Spam-Filtered: false Received: from unknown (HELO fldsmtpi03.verizon.com) ([166.68.71.145]) by fldsmtpe03.verizon.com with ESMTP; 15 Jul 2017 01:27:05 +0000 From: "Levin, Alexander (Sasha Levin)" Cc: Arnd Bergmann , Alex Williamson , "Levin, Alexander (Sasha Levin)" Received: from rogue-10-255-0-101.rogue.vzwcorp.com (HELO Genesis.verizonwireless.com) ([10.255.0.101]) by fldsmtpi03.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 15 Jul 2017 01:26:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1500081968; x=1531617968; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=menU+41m+/Y//DaabZ2irJfvbUS9WZd7fCEkwk2ujuQ=; b=qVHF/VweJ6Cr/b36LwifUQ/btiigdgGe67rzrsfBPku6RYEWx4MO0w52 re8/Xb4omSjcZtpCKHtjiSzRzmQo5XGDAW1vyGSbOsTlOqhODC5uzhgfY +OCIR3xK+hKUG0EYk68shB8RhzZdzzbYT1353xHNGss30abPPjdR5xIed I=; Received: from casac1exh001.uswin.ad.vzwcorp.com ([10.11.218.43]) by Genesis.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 14 Jul 2017 18:26:08 -0700 Received: from scwexch18apd.uswin.ad.vzwcorp.com (153.114.130.37) by CASAC1EXH001.uswin.ad.vzwcorp.com (10.11.218.43) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 14 Jul 2017 18:26:08 -0700 Received: from OMZP1LUMXCA14.uswin.ad.vzwcorp.com (144.8.22.189) by scwexch18apd.uswin.ad.vzwcorp.com (153.114.130.37) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Fri, 14 Jul 2017 18:26:07 -0700 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA14.uswin.ad.vzwcorp.com (144.8.22.189) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Fri, 14 Jul 2017 20:26:06 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1263.000; Fri, 14 Jul 2017 20:26:06 -0500 To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH for v4.9 LTS 16/87] vfio-pci: use 32-bit comparisons for register address for gcc-4.5 Thread-Topic: [PATCH for v4.9 LTS 16/87] vfio-pci: use 32-bit comparisons for register address for gcc-4.5 Thread-Index: AQHS/QlS+BZku6Z1rUyapQSAbuAAlA== Date: Sat, 15 Jul 2017 01:26:02 +0000 Message-ID: <20170715012538.10101-16-alexander.levin@verizon.com> References: <20170715012538.10101-1-alexander.levin@verizon.com> In-Reply-To: <20170715012538.10101-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 45e869714489431625c569d21fc952428d761476 ] Using ancient compilers (gcc-4.5 or older) on ARM, we get a link failure with the vfio-pci driver: ERROR: "__aeabi_lcmp" [drivers/vfio/pci/vfio-pci.ko] undefined! The reason is that the compiler tries to do a comparison of a 64-bit range. This changes it to convert to a 32-bit number explicitly first, as newer compilers do for themselves. Signed-off-by: Arnd Bergmann Signed-off-by: Alex Williamson Signed-off-by: Sasha Levin --- drivers/vfio/pci/vfio_pci_rdwr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.11.0 diff --git a/drivers/vfio/pci/vfio_pci_rdwr.c b/drivers/vfio/pci/vfio_pci_rdwr.c index 5ffd1d9ad4bd..357243d76f10 100644 --- a/drivers/vfio/pci/vfio_pci_rdwr.c +++ b/drivers/vfio/pci/vfio_pci_rdwr.c @@ -193,7 +193,10 @@ ssize_t vfio_pci_vga_rw(struct vfio_pci_device *vdev, char __user *buf, if (!vdev->has_vga) return -EINVAL; - switch (pos) { + if (pos > 0xbfffful) + return -EINVAL; + + switch ((u32)pos) { case 0xa0000 ... 0xbffff: count = min(count, (size_t)(0xc0000 - pos)); iomem = ioremap_nocache(0xa0000, 0xbffff - 0xa0000 + 1);