From: Shuah Khan <shuah.khan-VXdhtT5mjnY@public.gmane.org>
To: joerg.roedel-5C7GfCeVMHo@public.gmane.org,
tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org,
mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org,
Greg KH
<gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>
Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
LKML <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
shuahkhan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Subject: [PATCH -stable] amd_iommu: attach device fails on the last pci device
Date: Fri, 12 Oct 2012 10:29:27 -0600 [thread overview]
Message-ID: <1350059367.2643.17.camel@lorien2> (raw)
amd_iommu_attach_device() checks if device id is within the limits
of amd_iommu_last_bdf and instead checking if devid > amd_iommu_last_bdf,
it checks devid >= amd_iommu_last_bdf. As a result the last device attach
fails because amd_iommu_attach_device() returns an -EINVAL.
This bug is in linux-2.6.32 and an equivalent fix in linux-2.6.33 and has been
carried forward to later kernels and is in the upstream kernel. This equivalent
fix includes restructuring and consolidating device checks into a routine
check_device(). Instead of back-porting all of that work, spot-fixed the bug in
amd_iommu_attach_device() for linux-2.6.32.
Signed-off-by: Shuah Khan <shuah.khan-VXdhtT5mjnY@public.gmane.org>
CC: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> v2.6.32
---
arch/x86/kernel/amd_iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 3a44b75..67de7d7 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -2288,7 +2288,7 @@ static int amd_iommu_attach_device(struct iommu_domain *dom,
devid = calc_devid(pdev->bus->number, pdev->devfn);
- if (devid >= amd_iommu_last_bdf ||
+ if (devid > amd_iommu_last_bdf ||
devid != amd_iommu_alias_table[devid])
return -EINVAL;
--
1.7.9.5
next reply other threads:[~2012-10-12 16:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-12 16:29 Shuah Khan [this message]
2012-10-12 17:28 ` [PATCH -stable] amd_iommu: attach device fails on the last pci device Alex Williamson
2012-10-12 18:38 ` Jonathan Nieder
[not found] ` <20121012183828.GA16453-fcEM2ccDkbL2nhBuCrrZHw@public.gmane.org>
2012-10-12 18:44 ` Shuah Khan
2012-10-12 19:35 ` Jonathan Nieder
[not found] ` <20121012193543.GA16600-fcEM2ccDkbL2nhBuCrrZHw@public.gmane.org>
2012-10-23 15:07 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350059367.2643.17.camel@lorien2 \
--to=shuah.khan-vxdhtt5mjny@public.gmane.org \
--cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
--cc=hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=joerg.roedel-5C7GfCeVMHo@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=shuahkhan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org \
--cc=x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).