iommu/vt-d: Fix an off-by-one bug in __domain_mapping()
authorJiang Liu <jiang.liu@linux.intel.com>
Wed, 26 Nov 2014 01:42:10 +0000 (09:42 +0800)
committerZefan Li <lizefan@huawei.com>
Tue, 14 Apr 2015 09:33:44 +0000 (17:33 +0800)
commitb21fe28e46076d58c43d552a06e8f6b41ec247ea
tree87eab8739ec175403bdf911e8db841a397e209db
parent930830786da3f076da85ff0c057685bd69439b26
iommu/vt-d: Fix an off-by-one bug in __domain_mapping()

commit cc4f14aa170d895c9a43bdb56f62070c8a6da908 upstream.

There's an off-by-one bug in function __domain_mapping(), which may
trigger the BUG_ON(nr_pages < lvl_pages) when
(nr_pages + 1) & superpage_mask == 0

The issue was introduced by commit 9051aa0268dc "intel-iommu: Combine
domain_pfn_mapping() and domain_sg_mapping()", which sets sg_res to
"nr_pages + 1" to avoid some of the 'sg_res==0' code paths.

It's safe to remove extra "+1" because sg_res is only used to calculate
page size now.

Reported-And-Tested-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Acked-By: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
[lizf: Backported to 3.4: adjust context]
Signed-off-by: Zefan Li <lizefan@huawei.com>
drivers/iommu/intel-iommu.c