Date: Tue, 26 Nov 2013 08:32:37 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r258621 - head/sys/compat/freebsd32 Message-ID: <201311260832.rAQ8Wb8o076380@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Tue Nov 26 08:32:37 2013 New Revision: 258621 URL: http://svnweb.freebsd.org/changeset/base/258621 Log: Fix the compat32 sendfile() to be in line with my recent changes. Reminded by: kib Modified: head/sys/compat/freebsd32/freebsd32_misc.c Modified: head/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_misc.c Tue Nov 26 08:07:45 2013 (r258620) +++ head/sys/compat/freebsd32/freebsd32_misc.c Tue Nov 26 08:32:37 2013 (r258621) @@ -1652,6 +1652,7 @@ freebsd32_do_sendfile(struct thread *td, cap_rights_t rights; off_t offset; int error; + off_t sbytes; offset = PAIR32TO64(off_t, uap->offset); if (offset < 0) @@ -1692,8 +1693,10 @@ freebsd32_do_sendfile(struct thread *td, } error = fo_sendfile(fp, uap->s, hdr_uio, trl_uio, offset, - uap->nbytes, uap->sbytes, uap->flags, compat ? SFK_COMPAT : 0, td); + uap->nbytes, &sbytes, uap->flags, compat ? SFK_COMPAT : 0, td); fdrop(fp, td); + if (uap->sbytes != NULL) + copyout(&sbytes, uap->sbytes, sizeof(off_t)); out: if (hdr_uio)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311260832.rAQ8Wb8o076380>