Commit 018b8d12 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

[PATCH] frv: support module exception tables



Fix the exception table handling so that modules exceptions are dealt with.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40234401
...@@ -43,7 +43,7 @@ static inline unsigned long search_one_table(const struct exception_table_entry ...@@ -43,7 +43,7 @@ static inline unsigned long search_one_table(const struct exception_table_entry
*/ */
unsigned long search_exception_table(unsigned long pc) unsigned long search_exception_table(unsigned long pc)
{ {
unsigned long ret = 0; const struct exception_table_entry *extab;
/* determine if the fault lay during a memcpy_user or a memset_user */ /* determine if the fault lay during a memcpy_user or a memset_user */
if (__frame->lr == (unsigned long) &__memset_user_error_lr && if (__frame->lr == (unsigned long) &__memset_user_error_lr &&
...@@ -55,9 +55,10 @@ unsigned long search_exception_table(unsigned long pc) ...@@ -55,9 +55,10 @@ unsigned long search_exception_table(unsigned long pc)
*/ */
return (unsigned long) &__memset_user_error_handler; return (unsigned long) &__memset_user_error_handler;
} }
else if (__frame->lr == (unsigned long) &__memcpy_user_error_lr &&
(unsigned long) &memcpy <= pc && pc < (unsigned long) &__memcpy_end if (__frame->lr == (unsigned long) &__memcpy_user_error_lr &&
) { (unsigned long) &memcpy <= pc && pc < (unsigned long) &__memcpy_end
) {
/* the fault occurred in a protected memset /* the fault occurred in a protected memset
* - we search for the return address (in LR) instead of the program counter * - we search for the return address (in LR) instead of the program counter
* - it was probably during a copy_to/from_user() * - it was probably during a copy_to/from_user()
...@@ -65,27 +66,10 @@ unsigned long search_exception_table(unsigned long pc) ...@@ -65,27 +66,10 @@ unsigned long search_exception_table(unsigned long pc)
return (unsigned long) &__memcpy_user_error_handler; return (unsigned long) &__memcpy_user_error_handler;
} }
#ifndef CONFIG_MODULES extab = search_exception_tables(pc);
/* there is only the kernel to search. */ if (extab)
ret = search_one_table(__start___ex_table, __stop___ex_table - 1, pc); return extab->fixup;
return ret;
#else
/* the kernel is the last "module" -- no need to treat it special */
unsigned long flags;
struct module *mp;
spin_lock_irqsave(&modlist_lock, flags); return 0;
for (mp = module_list; mp != NULL; mp = mp->next) {
if (mp->ex_table_start == NULL || !(mp->flags & (MOD_RUNNING | MOD_INITIALIZING)))
continue;
ret = search_one_table(mp->ex_table_start, mp->ex_table_end - 1, pc);
if (ret)
break;
}
spin_unlock_irqrestore(&modlist_lock, flags);
return ret;
#endif
} /* end search_exception_table() */ } /* end search_exception_table() */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment