x86/uaccess: Fix up the fixup
authorPeter Zijlstra <peterz@infradead.org>
Wed, 3 Apr 2019 07:39:45 +0000 (09:39 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 3 Apr 2019 07:39:45 +0000 (09:39 +0200)
commitb69656fa7ea2f75e47d7bd5b9430359fa46488af
tree7084d68ae739b26776d7383d6f6c3eec9312bb4b
parent3693ca81151eacd498675baae56abede577e8b31
x86/uaccess: Fix up the fixup

New tooling got confused about this:

  arch/x86/lib/memcpy_64.o: warning: objtool: .fixup+0x7: return with UACCESS enabled

While the code isn't wrong, it is tedious (if at all possible) to
figure out what function a particular chunk of .fixup belongs to.

This then confuses the objtool uaccess validation. Instead of
returning directly from the .fixup, jump back into the right function.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/lib/memcpy_64.S