missing backports for x86 syscall function prototype cleanups

DISCUSSION Kees Cook 2 participants 3 messages Jan 16, 2020 Stable branch

Share & tools

Kees Cook

author

2020-01-16 01:41 UTC #0 lore raw

Hi!

Sami pointed out to me that 4 of 6 patches in Linus's tree that were cleaning up the x86 syscall function prototypes didn't make it into -stable.

These were backported:

8661d769ab77 ("syscalls/x86: Use the correct function type in SYSCALL_DEFINE0")

	(as e79138ba8e0ec84f3ab5daa4761e4d534bbc682d)
f53e2cd0b8ab ("x86/mm: Use the correct function type for native_set_fixmap()")
	(as a823d762a57519adeb33f5f12f761d636e42d32e)

But these are missing, leading to some confusion when working with v5.4 under CFI:

cf3b83e19d7c928e05a5d193c375463182c6029a
00198a6eaf66609de5e4de9163bb42c7ca9dd7b7
f48f01a92cca09e86d46c91d8edf9d5a71c61727
6e4847640c6aebcaa2d9b3686cecc91b41f09269

Can these get added please?

Thanks!

Signature · 1 line

Kees Cook

Greg Kroah-Hartman

maintainer

2020-01-16 08:29 UTC #1 lore raw

Quoted 16 lines · Kees Cook

Hi!
Sami pointed out to me that 4 of 6 patches in Linus's tree that were cleaning up the x86 syscall function prototypes didn't make it into -stable.
These were backported:
8661d769ab77 ("syscalls/x86: Use the correct function type in SYSCALL_DEFINE0")
	(as e79138ba8e0ec84f3ab5daa4761e4d534bbc682d)
f53e2cd0b8ab ("x86/mm: Use the correct function type for native_set_fixmap()")
	(as a823d762a57519adeb33f5f12f761d636e42d32e)
But these are missing, leading to some confusion when working with v5.4 under CFI:

Quoted 6 lines

cf3b83e19d7c928e05a5d193c375463182c6029a
00198a6eaf66609de5e4de9163bb42c7ca9dd7b7
f48f01a92cca09e86d46c91d8edf9d5a71c61727
6e4847640c6aebcaa2d9b3686cecc91b41f09269
Can these get added please?

I've queued them up now. But for 4.19, are these also needed? If so, f48f01a92cca ("syscalls/x86: Use the correct function type for sys_ni_syscall") needs a backport for it to work properly.

thanks,

greg k-h

Kees Cook

author

2020-01-16 23:53 UTC #2 lore raw

Quoted 22 lines · Greg Kroah-Hartman

Quoted 21 lines · Kees Cook
Hi!
Sami pointed out to me that 4 of 6 patches in Linus's tree that were cleaning up the x86 syscall function prototypes didn't make it into -stable.
These were backported:
8661d769ab77 ("syscalls/x86: Use the correct function type in SYSCALL_DEFINE0")
	(as e79138ba8e0ec84f3ab5daa4761e4d534bbc682d)
f53e2cd0b8ab ("x86/mm: Use the correct function type for native_set_fixmap()")
	(as a823d762a57519adeb33f5f12f761d636e42d32e)
But these are missing, leading to some confusion when working with v5.4 under CFI:
cf3b83e19d7c928e05a5d193c375463182c6029a
00198a6eaf66609de5e4de9163bb42c7ca9dd7b7
f48f01a92cca09e86d46c91d8edf9d5a71c61727
6e4847640c6aebcaa2d9b3686cecc91b41f09269

Quoted 5 lines

Quoted 1 line
Can these get added please?
I've queued them up now. But for 4.19, are these also needed? If so, f48f01a92cca ("syscalls/x86: Use the correct function type for sys_ni_syscall") needs a backport for it to work properly.

I think, for now, we don't need to. v5.4 should be enough. Thanks!

-Kees

Signature · 1 line

Kees Cook