@@ -19,11 +19,17 @@ extern const char *xen_extra_version(void);
void apply_hook(void)
{
printk(KERN_DEBUG "Hook executing.\n");
+ /* The hook is called _after_ the patching. */
+ if ( strcmp(xen_extra_version(), "Hello World") )
+ BUG();
}
void revert_hook(void)
{
printk(KERN_DEBUG "Hook unloaded.\n");
+ /* The hook is called _after_ the unpatching. */
+ if ( !strcmp(xen_extra_version(), "Hello World") )
+ BUG();
}
XSPLICE_LOAD_HOOK(apply_hook);
@@ -50,6 +50,7 @@
#include <xen/paging.h>
#include <xen/virtual_region.h>
#include <xen/watchdog.h>
+#include <xen/xsplice.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/atomic.h>
@@ -1190,7 +1191,7 @@ void do_invalid_op(struct cpu_user_regs *regs)
/* WARN, BUG or ASSERT: decode the filename pointer and line number. */
filename = bug_ptr(bug);
- if ( !is_kernel(filename) )
+ if ( !is_kernel(filename) && !is_patch(filename) )
goto die;
fixup = strlen(filename);
if ( fixup > 50 )
@@ -1217,7 +1218,7 @@ void do_invalid_op(struct cpu_user_regs *regs)
case BUGFRAME_assert:
/* ASSERT: decode the predicate string pointer. */
predicate = bug_msg(bug);
- if ( !is_kernel(predicate) )
+ if ( !is_kernel(predicate) && !is_patch(predicate) )
predicate = "<unknown>";
printk("Assertion '%s' failed at %s%s:%d\n",
@@ -120,6 +120,24 @@ static int verify_payload(const xen_sysctl_xsplice_upload_t *upload)
return 0;
}
+bool_t is_patch(const void *ptr)
+{
+ struct payload *data;
+
+ /*
+ * No locking since this list is only ever changed during apply or revert
+ * context.
+ */
+ list_for_each_entry ( data, &applied_list, applied_list )
+ {
+ if ( ptr >= data->ro_addr &&
+ ptr < (data->ro_addr + data->ro_size) )
+ return 1;
+ }
+
+ return 0;
+}
+
uint64_t xsplice_symbols_lookup_by_name(const char *symname)
{
struct payload *data;
@@ -533,6 +551,28 @@ static int prepare_payload(struct payload *payload,
region->start = (unsigned long)payload->text_addr;
region->end = (unsigned long)(payload->text_addr + payload->text_size);
+ /* Optional sections. */
+ for ( i = 0; i < BUGFRAME_NR; i++ )
+ {
+ char str[14];
+
+ snprintf(str, sizeof str, ".bug_frames.%u", i);
+ sec = xsplice_elf_sec_by_name(elf, str);
+ if ( !sec )
+ continue;
+
+ if ( !sec->sec->sh_size ||
+ (sec->sec->sh_size % sizeof (struct bug_frame)) )
+ {
+ dprintk(XENLOG_DEBUG, "%s%s: Wrong size of .bug_frames.%u!\n",
+ XSPLICE, elf->name, i);
+ return -EINVAL;
+ }
+
+ region->frame[i].bugs = (struct bug_frame *)sec->load_addr;
+ region->frame[i].n_bugs = sec->sec->sh_size / sizeof(struct bug_frame);
+ }
+
return 0;
}
@@ -42,6 +42,7 @@ struct xsplice_symbol {
int xsplice_op(struct xen_sysctl_xsplice_op *);
void check_for_xsplice_work(void);
+bool_t is_patch(const void *addr);
uint64_t xsplice_symbols_lookup_by_name(const char *symname);
/* Arch hooks. */
@@ -106,6 +107,10 @@ static inline int xsplice_op(struct xen_sysctl_xsplice_op *op)
return -EOPNOTSUPP;
}
static inline void check_for_xsplice_work(void) { };
+static inline bool_t is_patch(const void *addr)
+{
+ return 0;
+}
#endif /* CONFIG_XSPLICE */
#endif /* __XEN_XSPLICE_H__ */