]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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)
committerJiri Slaby <jslaby@suse.cz>
Mon, 26 Jan 2015 13:38:48 +0000 (14:38 +0100)
commitb377e72cf3c79fcba0fad4b0925fde850d353a15
treecfe6dee6a85ddc1acb1fbd5f37ab8fb3d17e0fa0
parentd97a9dc7ab8bcad943464de5d27e1341bad3ccbb
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/iommu/intel-iommu.c