On Thu, Jan 07, 2016 at 01:11:31PM +0100, Borislav Petkov wrote:
> #ifdef __ASSEMBLY__
> # define _ASM_EXTABLE(from,to) \
> .pushsection "__ex_table","a" ; \
> - .balign 8 ; \
> + .balign 4 ; \
> .long (from) - . ; \
> .long (to) - . ; \
> + .long 0; \
Why not
.long ex_handler_default - . ;
Then you wouldn't have to special case the zero in the lookup
(and in the sort, which you don't do now, but should)
> @@ -33,42 +67,36 @@ int fixup_exception(struct pt_regs *regs)
> }
> #endif
>
> - fixup = search_exception_tables(regs->ip);
> - if (fixup) {
> - new_ip = ex_fixup_addr(fixup);
> -
> - if (fixup->fixup - fixup->insn >= 0x7ffffff0 - 4) {
> - /* Special hack for uaccess_err */
> - current_thread_info()->uaccess_err = 1;
> - new_ip -= 0x7ffffff0;
> - }
> - regs->ip = new_ip;
> - return 1;
> - }
> + e = search_exception_tables(regs->ip);
> + if (!e)
> + return 0;
>
> - return 0;
> + new_ip = ex_fixup_addr(e);
Assigned, but not used - delete the declaration above too.
> +static void x86_sort_relative_table(char *extab_image, int image_size)
> +{
> + int i;
> +
> + i = 0;
> + while (i < image_size) {
> + uint32_t *loc = (uint32_t *)(extab_image + i);
> +
> + w(r(loc) + i, loc);
> + w(r(loc + 1) + i + 4, loc + 1);
Need to twiddle the 'handler' field too (unless it is 0). If you
give up on the magic zero and fill in the offset to ex_handler_default
then I *think* you need:
w(r(loc + 2) + i + 8, loc + 2);
the special case *might* be:
if (r(loc + 2))
w(r(loc + 2) + i + 8, loc + 2);
> +
> + i += sizeof(uint32_t) * 3;
> + }
> +
> + qsort(extab_image, image_size / 12, 12, compare_relative_table);
> +
> + i = 0;
> + while (i < image_size) {
> + uint32_t *loc = (uint32_t *)(extab_image + i);
> +
> + w(r(loc) - i, loc);
> + w(r(loc + 1) - (i + 4), loc + 1);
ditto, untwiddle the handler (unless it was zero)
w(r(loc + 2) - (i + 8), loc + 2);
There is also arch/x86/mm/extable.c:sort_extable() which will
be used on the main kernel exception table if for some reason
the build skipped using scripts/sortextable ... and is always
used for exception tables in modules. It also needs to know
about the new field (and would be another place to special case
the zero fields for the default handler).
-Tony
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>