[Xen-changelog] [xen stable-4.6] hvmloader: fix scratch_alloc to avoid overlaps

[patchbot@xxxxxxx]

commit 3d8689b6b135b5976ff62d48c61df9bbda01f10c
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Wed Feb 17 16:41:01 2016 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Feb 17 16:41:01 2016 +0100

    hvmloader: fix scratch_alloc to avoid overlaps
    
    scratch_alloc() set scratch_start to the last byte of the current
    allocation.  The value of scratch_start is then reused as is (if it is
    already aligned) in the next allocation.  This result in a potential reuse
    of the last byte of the previous allocation.
    
    Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 4ab3ac074cb1f101f42e02103fa263a1f4f422b5
    master date: 2016-02-10 14:46:45 +0100
---
 tools/firmware/hvmloader/util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index d779fd7..9382709 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -478,7 +478,7 @@ void *scratch_alloc(uint32_t size, uint32_t align)
     if ( align < 16 )
         align = 16;
 
-    s = (scratch_start + align - 1) & ~(align - 1);
+    s = (scratch_start + align) & ~(align - 1);
     e = s + size - 1;
 
     BUG_ON(e < s);
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

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