From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752015AbdFARAt (ORCPT ); Thu, 1 Jun 2017 13:00:49 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:60912 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751411AbdFAPnL (ORCPT ); Thu, 1 Jun 2017 11:43:11 -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, "Nikola Pajkovsky" , "Muli Ben-Yehuda" , iommu@lists.linux-foundation.org, "Jon Mason" , "Thomas Gleixner" Date: Thu, 01 Jun 2017 16:40:55 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.2 036/101] 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.2.89-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 @@ -295,7 +295,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.2 036/101] x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0 Date: Thu, 01 Jun 2017 16:40:55 +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 My4yLjg5LXJjMSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IE5pa29sYSBQYWpr b3Zza3kgPG5wYWprb3Zza3lAc3VzZS5jej4KCmNvbW1pdCA2OGRlZThlMmYyY2FjYzU0ZDAzODM5 NGU3MGQyMjQxMWRlZTg5ZGEyIHVwc3RyZWFtLgoKY29tbWl0IDhmZDUyNGIzNTVkYSAoIng4Njog S2lsbCBiYWRfZG1hX2FkZHJlc3MgdmFyaWFibGUiKSBoYXMga2lsbGVkCmJhZF9kbWFfYWRkcmVz cyB2YXJpYWJsZSBhbmQgdXNlZCBpbnN0ZWFkIG9mIG1hY3JvIERNQV9FUlJPUl9DT0RFCndoaWNo IGlzIGFsd2F5cyB6ZXJvLiBTaW5jZSBkbWFfYWRkciBpcyB1bnNpZ25lZCwgdGhlIHN0YXRlbWVu dAoKICAgZG1hX2FkZHIgPj0gRE1BX0VSUk9SX0NPREUKCmlzIGFsd2F5cyB0cnVlLCBhbmQgbm90 IG5lZWRlZC4KCmFyY2gveDg2L2tlcm5lbC9wY2ktY2FsZ2FyeV82NC5jOiBJbiBmdW5jdGlvbiDi gJhpb21tdV9mcmVl4oCZOgphcmNoL3g4Ni9rZXJuZWwvcGNpLWNhbGdhcnlfNjQuYzoyOTk6Mjog d2FybmluZzogY29tcGFyaXNvbiBvZiB1bnNpZ25lZCBleHByZXNzaW9uID49IDAgaXMgYWx3YXlz IHRydWUgWy1XdHlwZS1saW1pdHNdCiAgaWYgKHVubGlrZWx5KChkbWFfYWRkciA+PSBETUFfRVJS T1JfQ09ERSkgJiYgKGRtYV9hZGRyIDwgYmFkZW5kKSkpIHsKCkZpeGVzOiA4ZmQ1MjRiMzU1ZGEg KCJ4ODY6IEtpbGwgYmFkX2RtYV9hZGRyZXNzIHZhcmlhYmxlIikKU2lnbmVkLW9mZi1ieTogTmlr b2xhIFBhamtvdnNreSA8bnBhamtvdnNreUBzdXNlLmN6PgpDYzogaW9tbXVAbGlzdHMubGludXgt Zm91bmRhdGlvbi5vcmcKQ2M6IEpvbiBNYXNvbiA8amRtYXNvbkBrdWR6dS51cz4KQ2M6IE11bGkg QmVuLVllaHVkYSA8bXVsaXhAbXVsaXgub3JnPgpMaW5rOiBodHRwOi8vbGttbC5rZXJuZWwub3Jn L3IvNzYxMmMwZjlkZDdjMTI5MDQwN2RiZjhlODA5ZGVmOTIyMDA2OTIwYi4xNDc5MTYxMTc3Lmdp dC5ucGFqa292c2t5QHN1c2UuY3oKU2lnbmVkLW9mZi1ieTogVGhvbWFzIEdsZWl4bmVyIDx0Z2x4 QGxpbnV0cm9uaXguZGU+ClNpZ25lZC1vZmYtYnk6IEJlbiBIdXRjaGluZ3MgPGJlbkBkZWNhZGVu dC5vcmcudWs+Ci0tLQogYXJjaC94ODYva2VybmVsL3BjaS1jYWxnYXJ5XzY0LmMgfCAyICstCiAx IGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCi0tLSBhL2FyY2gv eDg2L2tlcm5lbC9wY2ktY2FsZ2FyeV82NC5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC9wY2ktY2Fs Z2FyeV82NC5jCkBAIC0yOTUsNyArMjk1LDcgQEAgc3RhdGljIHZvaWQgaW9tbXVfZnJlZShzdHJ1 Y3QgaW9tbXVfdGFibAogCiAJLyogd2VyZSB3ZSBjYWxsZWQgd2l0aCBiYWRfZG1hX2FkZHJlc3M/ ICovCiAJYmFkZW5kID0gRE1BX0VSUk9SX0NPREUgKyAoRU1FUkdFTkNZX1BBR0VTICogUEFHRV9T SVpFKTsKLQlpZiAodW5saWtlbHkoKGRtYV9hZGRyID49IERNQV9FUlJPUl9DT0RFKSAmJiAoZG1h X2FkZHIgPCBiYWRlbmQpKSkgeworCWlmICh1bmxpa2VseShkbWFfYWRkciA8IGJhZGVuZCkpIHsK IAkJV0FSTigxLCBLRVJOX0VSUiAiQ2FsZ2FyeTogZHJpdmVyIHRyaWVkIHVubWFwcGluZyBiYWQg RE1BICIKIAkJICAgICAgICJhZGRyZXNzIDB4JUx4XG4iLCBkbWFfYWRkcik7CiAJCXJldHVybjsK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlvbW11IG1h aWxpbmcgbGlzdAppb21tdUBsaXN0cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3Rz LmxpbnV4Zm91bmRhdGlvbi5vcmcvbWFpbG1hbi9saXN0aW5mby9pb21tdQ==