Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=093f87d279669c74e84530e925e4735c9aae8898
Commit:     093f87d279669c74e84530e925e4735c9aae8898
Parent:     652c538eb5bc3fa04bc5f27db9014f0168aefe97
Author:     Fenghua Yu <[EMAIL PROTECTED]>
AuthorDate: Wed Nov 21 15:07:14 2007 -0800
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 15:04:21 2008 -0800

    PCI: More Sanity checks for DMAR
    
    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.
    
    [EMAIL PROTECTED]: coding-style fixes]
    
    Signed-off-by: Fenghua Yu <[EMAIL PROTECTED]>
    Acked-by: mark gross <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/pci/dmar.c |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 5dfdfda..91b2dc9 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -25,6 +25,7 @@
 
 #include <linux/pci.h>
 #include <linux/dmar.h>
+#include "iova.h"
 
 #undef PREFIX
 #define PREFIX "DMAR:"
@@ -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;
        }
 
@@ -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;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to