Re: [Xen-users] XSA30 patching issue

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Sat, 2012-12-08 at 20:41 +0000, chris@xxxxxxxxxxxxxxxx wrote:
> Hi
> 
> We run Xen 4.1.3 on a number of systems and I've added all of the 
> relavent recent patches (Upto XSA31) on CentOS 5 systems and compiled 
> with no issue.
> 
> On CentOS 6, XSA30 fails to patch. I've re-downloaded xen-4.1.3.tar.gz, 
> the patch and checked filesizes and everything checks out.
> 
> patching file xen/arch/x86/mm/p2m.c
> Hunk #1 succeeded at 2476 with fuzz 2 (offset 64 lines).
> Hunk #2 FAILED at 2433.
> Hunk #3 FAILED at 2456.
> 2 out of 3 hunks FAILED -- saving rejects to file 
> xen/arch/x86/mm/p2m.c.rej
> 
> Can anyone advise why this is failing? I can replicate this on various 
> CentOS 6 systems so I don't think its my machine.
> 
> I've attached p2mc.rej

The p2m.c causing the problem would have been useful too.

It looks like there has been a changing in the surrounding context, in
guest_physmap_mark_populate_on_demand this:
     BUG_ON(!paging_mode_translate(d));
became
     if ( !paging_mode_translate(d) )
         return -EINVAL;
in 23351:8ebda5388e4e, which is XSA-14.

It should still be possible to apply the patch by hand, or better yet
apply the patch for XSA-14.

Ian.


_______________________________________________
Xen-users mailing list
Xen-users@xxxxxxxxxxxxx
http://lists.xen.org/xen-users