From: Ross Lagerwall <ross.lagerwall@citrix.com>
Date: Tue, 10 May 2016 09:10:02 +0000 (+0100)
Subject: xsplice: Prevent new symbols duplicating core symbols
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1135
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fec659aa2dd9cfc9f35f05266179bbdde75203f0;p=xen.git

xsplice: Prevent new symbols duplicating core symbols

When loading patches, the code prevents loading a patch containing a new
symbol that duplicates a symbol from another loaded patch. However, the
check should also prevent loading a new symbol that duplicates a symbol
from the core hypervisor.

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/xen/common/xsplice.c b/xen/common/xsplice.c
index c9fc53a369..21b9ec027a 100644
--- a/xen/common/xsplice.c
+++ b/xen/common/xsplice.c
@@ -748,7 +748,8 @@ static int build_symbol_table(struct payload *payload,
 
         if ( !found )
         {
-            if ( xsplice_symbols_lookup_by_name(symtab[i].name) )
+            if ( symbols_lookup_by_name(symtab[i].name) ||
+                 xsplice_symbols_lookup_by_name(symtab[i].name) )
             {
                 dprintk(XENLOG_ERR, XSPLICE "%s: duplicate new symbol: %s\n",
                         elf->name, symtab[i].name);