Date: Fri, 27 Sep 2013 07:10:01 GMT From: dfilter@FreeBSD.ORG (dfilter service) To: freebsd-bugs@FreeBSD.org Subject: Re: kern/182161: commit references a PR Message-ID: <201309270710.r8R7A1GK086519@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR kern/182161; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: kern/182161: commit references a PR Date: Fri, 27 Sep 2013 07:02:56 +0000 (UTC) Author: kib Date: Fri Sep 27 07:02:48 2013 New Revision: 255906 URL: http://svnweb.freebsd.org/changeset/base/255906 Log: MFC r255844: Ensure that the ERESTART return from the syscall reloads the registers, to make the restarted syscall instruction pass the correct arguments. PR: kern/182161 Modified: stable/8/sys/amd64/amd64/vm_machdep.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/ (props changed) Modified: stable/8/sys/amd64/amd64/vm_machdep.c ============================================================================== --- stable/8/sys/amd64/amd64/vm_machdep.c Fri Sep 27 06:56:58 2013 (r255905) +++ stable/8/sys/amd64/amd64/vm_machdep.c Fri Sep 27 07:02:48 2013 (r255906) @@ -395,9 +395,13 @@ cpu_set_syscall_retval(struct thread *td * for the next iteration. * %r10 restore is only required for freebsd/amd64 processes, * but shall be innocent for any ia32 ABI. + * + * Require full context restore to get the arguments + * in the registers reloaded at return to usermode. */ td->td_frame->tf_rip -= td->td_frame->tf_err; td->td_frame->tf_r10 = td->td_frame->tf_rcx; + set_pcb_flags(td->td_pcb, PCB_FULL_IRET); break; case EJUSTRETURN: _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309270710.r8R7A1GK086519>