Changeset 72cf064 in mainline for kernel/arch/amd64/src/asm.S

Timestamp:

2012-08-13T17:17:04Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/amd64/src/asm.S (modified) (2 diffs)

kernel/arch/amd64/src/asm.S

@@ -362 +362 @@
          */
         call syscall_handler
-        
+
+        /*
+         * Test if the saved return address is canonical and not-kernel.
+         * We do this by looking at the 16 most significant bits
+         * of the saved return address (two bytes at offset 6).
+         */
+        testw $0xffff, ISTATE_OFFSET_RIP+6(%rsp)
+        jnz bad_rip 
+
         cli
         
@@ -388 +396 @@
         sysretq
 
+bad_rip:
+        movq %rsp, %rdi
+        movabs $bad_rip_msg, %rsi
+        xorb %al, %al
+        callq fault_from_uspace
+        /* not reached */
+        
+bad_rip_msg:
+        .asciz "Invalid instruction pointer."
+
 /** Print Unicode character to EGA display.
  *