[Xen-changelog] [xen master] xen/arm: next_module: Skip module if the size is 0

[patchbot@xxxxxxx]

commit c84e6224f5c9788cf8356cc2aad32b4a12d9834e
Author:     Julien Grall <julien.grall@xxxxxxxxxx>
AuthorDate: Mon Mar 17 14:05:54 2014 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Mar 21 11:10:12 2014 +0000

    xen/arm: next_module: Skip module if the size is 0
    
    When the the module size is 0, it means that the module was not provided by
    the user. It can happen, if the user choose to boot without initrd.
    
    In this case, both fields (start and size) are zeroed. Therefore, 
next_module
    will return 0 every time if there is other non-zero module after this one. 
This
    can happen when the XSM module is added.
    
    Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/arch/arm/setup.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index d59e7f8..215ec24 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -284,6 +284,9 @@ static paddr_t __init next_module(paddr_t s, paddr_t *end)
         paddr_t mod_s = mi->module[i].start;
         paddr_t mod_e = mod_s + mi->module[i].size;
 
+        if ( !mi->module[i].size )
+            continue;
+
         if ( mod_s < s )
             continue;
         if ( mod_s > lowest )
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog