From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751214AbdFAQLP (ORCPT ); Thu, 1 Jun 2017 12:11:15 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:33422 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752187AbdFAPpE (ORCPT ); Thu, 1 Jun 2017 11:45:04 -0400 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Muli Ben-Yehuda" , "Nikola Pajkovsky" , "Thomas Gleixner" , "Jon Mason" , iommu@lists.linux-foundation.org Date: Thu, 01 Jun 2017 16:43:16 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 095/212] x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0 In-Reply-To: X-SA-Exim-Connect-IP: 82.70.136.246 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.44-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Nikola Pajkovsky commit 68dee8e2f2cacc54d038394e70d22411dee89da2 upstream. commit 8fd524b355da ("x86: Kill bad_dma_address variable") has killed bad_dma_address variable and used instead of macro DMA_ERROR_CODE which is always zero. Since dma_addr is unsigned, the statement dma_addr >= DMA_ERROR_CODE is always true, and not needed. arch/x86/kernel/pci-calgary_64.c: In function ‘iommu_free’: arch/x86/kernel/pci-calgary_64.c:299:2: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits] if (unlikely((dma_addr >= DMA_ERROR_CODE) && (dma_addr < badend))) { Fixes: 8fd524b355da ("x86: Kill bad_dma_address variable") Signed-off-by: Nikola Pajkovsky Cc: iommu@lists.linux-foundation.org Cc: Jon Mason Cc: Muli Ben-Yehuda Link: http://lkml.kernel.org/r/7612c0f9dd7c1290407dbf8e809def922006920b.1479161177.git.npajkovsky@suse.cz Signed-off-by: Thomas Gleixner Signed-off-by: Ben Hutchings --- arch/x86/kernel/pci-calgary_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -296,7 +296,7 @@ static void iommu_free(struct iommu_tabl /* were we called with bad_dma_address? */ badend = DMA_ERROR_CODE + (EMERGENCY_PAGES * PAGE_SIZE); - if (unlikely((dma_addr >= DMA_ERROR_CODE) && (dma_addr < badend))) { + if (unlikely(dma_addr < badend)) { WARN(1, KERN_ERR "Calgary: driver tried unmapping bad DMA " "address 0x%Lx\n", dma_addr); return; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Hutchings Subject: [PATCH 3.16 095/212] x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0 Date: Thu, 01 Jun 2017 16:43:16 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Muli Ben-Yehuda , iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Nikola Pajkovsky , akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org, Thomas Gleixner List-Id: iommu@lists.linux-foundation.org My4xNi40NC1yYzEgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBOaWtvbGEgUGFq a292c2t5IDxucGFqa292c2t5QHN1c2UuY3o+Cgpjb21taXQgNjhkZWU4ZTJmMmNhY2M1NGQwMzgz OTRlNzBkMjI0MTFkZWU4OWRhMiB1cHN0cmVhbS4KCmNvbW1pdCA4ZmQ1MjRiMzU1ZGEgKCJ4ODY6 IEtpbGwgYmFkX2RtYV9hZGRyZXNzIHZhcmlhYmxlIikgaGFzIGtpbGxlZApiYWRfZG1hX2FkZHJl c3MgdmFyaWFibGUgYW5kIHVzZWQgaW5zdGVhZCBvZiBtYWNybyBETUFfRVJST1JfQ09ERQp3aGlj aCBpcyBhbHdheXMgemVyby4gU2luY2UgZG1hX2FkZHIgaXMgdW5zaWduZWQsIHRoZSBzdGF0ZW1l bnQKCiAgIGRtYV9hZGRyID49IERNQV9FUlJPUl9DT0RFCgppcyBhbHdheXMgdHJ1ZSwgYW5kIG5v dCBuZWVkZWQuCgphcmNoL3g4Ni9rZXJuZWwvcGNpLWNhbGdhcnlfNjQuYzogSW4gZnVuY3Rpb24g 4oCYaW9tbXVfZnJlZeKAmToKYXJjaC94ODYva2VybmVsL3BjaS1jYWxnYXJ5XzY0LmM6Mjk5OjI6 IHdhcm5pbmc6IGNvbXBhcmlzb24gb2YgdW5zaWduZWQgZXhwcmVzc2lvbiA+PSAwIGlzIGFsd2F5 cyB0cnVlIFstV3R5cGUtbGltaXRzXQogIGlmICh1bmxpa2VseSgoZG1hX2FkZHIgPj0gRE1BX0VS Uk9SX0NPREUpICYmIChkbWFfYWRkciA8IGJhZGVuZCkpKSB7CgpGaXhlczogOGZkNTI0YjM1NWRh ICgieDg2OiBLaWxsIGJhZF9kbWFfYWRkcmVzcyB2YXJpYWJsZSIpClNpZ25lZC1vZmYtYnk6IE5p a29sYSBQYWprb3Zza3kgPG5wYWprb3Zza3lAc3VzZS5jej4KQ2M6IGlvbW11QGxpc3RzLmxpbnV4 LWZvdW5kYXRpb24ub3JnCkNjOiBKb24gTWFzb24gPGpkbWFzb25Aa3VkenUudXM+CkNjOiBNdWxp IEJlbi1ZZWh1ZGEgPG11bGl4QG11bGl4Lm9yZz4KTGluazogaHR0cDovL2xrbWwua2VybmVsLm9y Zy9yLzc2MTJjMGY5ZGQ3YzEyOTA0MDdkYmY4ZTgwOWRlZjkyMjAwNjkyMGIuMTQ3OTE2MTE3Ny5n aXQubnBhamtvdnNreUBzdXNlLmN6ClNpZ25lZC1vZmYtYnk6IFRob21hcyBHbGVpeG5lciA8dGds eEBsaW51dHJvbml4LmRlPgpTaWduZWQtb2ZmLWJ5OiBCZW4gSHV0Y2hpbmdzIDxiZW5AZGVjYWRl bnQub3JnLnVrPgotLS0KIGFyY2gveDg2L2tlcm5lbC9wY2ktY2FsZ2FyeV82NC5jIHwgMiArLQog MSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgotLS0gYS9hcmNo L3g4Ni9rZXJuZWwvcGNpLWNhbGdhcnlfNjQuYworKysgYi9hcmNoL3g4Ni9rZXJuZWwvcGNpLWNh bGdhcnlfNjQuYwpAQCAtMjk2LDcgKzI5Niw3IEBAIHN0YXRpYyB2b2lkIGlvbW11X2ZyZWUoc3Ry dWN0IGlvbW11X3RhYmwKIAogCS8qIHdlcmUgd2UgY2FsbGVkIHdpdGggYmFkX2RtYV9hZGRyZXNz PyAqLwogCWJhZGVuZCA9IERNQV9FUlJPUl9DT0RFICsgKEVNRVJHRU5DWV9QQUdFUyAqIFBBR0Vf U0laRSk7Ci0JaWYgKHVubGlrZWx5KChkbWFfYWRkciA+PSBETUFfRVJST1JfQ09ERSkgJiYgKGRt YV9hZGRyIDwgYmFkZW5kKSkpIHsKKwlpZiAodW5saWtlbHkoZG1hX2FkZHIgPCBiYWRlbmQpKSB7 CiAJCVdBUk4oMSwgS0VSTl9FUlIgIkNhbGdhcnk6IGRyaXZlciB0cmllZCB1bm1hcHBpbmcgYmFk IERNQSAiCiAJCSAgICAgICAiYWRkcmVzcyAweCVMeFxuIiwgZG1hX2FkZHIpOwogCQlyZXR1cm47 CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppb21tdSBt YWlsaW5nIGxpc3QKaW9tbXVAbGlzdHMubGludXgtZm91bmRhdGlvbi5vcmcKaHR0cHM6Ly9saXN0 cy5saW51eGZvdW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGluZm8vaW9tbXU=