[PATCH] Fix sysenter (%ebp) fault handling

Luca Barbieri (ldb@ldb.ods.org)
Mon, 6 Jan 2003 03:03:51 +0100


This is a MIME-formatted message. If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-29334-1041819116-0001-2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Currently syscall_badsys is called to handle faults when reading the
sixth parameter in sysenter; however that routine assumes that
registers have already been pushed on the stack, and this is not the
case (in other words, it will currently try to pop beyond the end of
the thread stack).

This patch adds a new "function", syscall_fault, that saves register
and returns.

The return value is changed to EFAULT, which seems more appropriate
than ENOSYS.

diff --exclude-from=3D/home/ldb/src/exclude -urNdp --exclude=3D'speedtouch.=
*' --exclude=3D'atmsar.*' linux-2.5.54/arch/i386/kernel/entry.S linux-2.5.5=
4-ldb/arch/i386/kernel/entry.S
--- linux-2.5.54/arch/i386/kernel/entry.S 2003-01-02 04:21:27.000000000 +01=
00
+++ linux-2.5.54-ldb/arch/i386/kernel/entry.S 2003-01-04 19:06:07.000000000=
+0100
@@ -253,11 +253,11 @@ ENTRY(sysenter_entry)
* Careful about security.
*/
cmpl $__PAGE_OFFSET-3,%ebp
- jae syscall_badsys
+ jae syscall_fault
1: movl (%ebp),%ebp
.section __ex_table,"a"
.align 4
- .long 1b,syscall_badsys
+ .long 1b,syscall_fault
.previous
=20
pushl %eax
@@ -367,6 +373,14 @@ syscall_exit_work:
jmp resume_userspace
=20
ALIGN
+syscall_fault:
+ pushl %eax # save orig_eax
+ SAVE_ALL
+ GET_THREAD_INFO(%ebx)
+ movl $-EFAULT,EAX(%esp)
+ jmp resume_userspace
+
+ ALIGN
syscall_badsys:
movl $-ENOSYS,EAX(%esp)
jmp resume_userspace

--=_courier-29334-1041819116-0001-2
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+GOQGdjkty3ft5+cRApJgAKCBuYekAjw7NrXTPDnaGp6CYc8sXACeOZaX
6y1XNedehFjnHyWL0SnH+qI=
=gFhw
-----END PGP SIGNATURE-----

--=_courier-29334-1041819116-0001-2--