Skip to content

Commit

Permalink
PCI: More Sanity checks for DMAR
Browse files Browse the repository at this point in the history
Add and changes a few sanity checks in dmar.c.

1.  The haw field in ACPI DMAR table in VT-d spec doesn't describe the
   range of haw.  But since DMA page size is 4KB in DMA remapping, haw
   should be at least 4KB.  The current VT-d code in dmar.c returns failure
   when haw==0.  This sanity check is not accurate and execution can pass
   when haw is less than one page size 4KB.  This patch changes the haw
   sanity check to validate if haw is less than 4KB.

2. Add dmar_rmrr_units verification.

3. Add parse_dmar_table() verification.

[akpm@linux-foundation.org: coding-style fixes]

Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Acked-by: mark gross <mgross@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Fenghua Yu authored and Greg Kroah-Hartman committed Feb 1, 2008
1 parent 652c538 commit 093f87d
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions drivers/pci/dmar.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include <linux/pci.h>
#include <linux/dmar.h>
#include "iova.h"

#undef PREFIX
#define PREFIX "DMAR:"
Expand Down Expand Up @@ -263,8 +264,8 @@ parse_dmar_table(void)
if (!dmar)
return -ENODEV;

if (!dmar->width) {
printk (KERN_WARNING PREFIX "Zero: Invalid DMAR haw\n");
if (dmar->width < PAGE_SHIFT_4K - 1) {
printk(KERN_WARNING PREFIX "Invalid DMAR haw\n");
return -EINVAL;
}

Expand Down Expand Up @@ -301,11 +302,24 @@ parse_dmar_table(void)
int __init dmar_table_init(void)
{

parse_dmar_table();
int ret;

ret = parse_dmar_table();
if (ret) {
printk(KERN_INFO PREFIX "parse DMAR table failure.\n");
return ret;
}

if (list_empty(&dmar_drhd_units)) {
printk(KERN_INFO PREFIX "No DMAR devices found\n");
return -ENODEV;
}

if (list_empty(&dmar_rmrr_units)) {
printk(KERN_INFO PREFIX "No RMRR found\n");
return -ENODEV;
}

return 0;
}

Expand Down

0 comments on commit 093f87d

Please sign in to comment.