upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-13 18:50:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sendfile: fix CURVNET_SET()/CURVNET_RESTORE()

Browse source 
Keep it set around the main cycle that works with the socket and restore
before the cleanup path, cause there are jumps into cleanup that precede
the main cycle.

Fixes:	9a7d03c7df
This commit is contained in:
Gleb Smirnoff 2025-05-06 13:00:45 -07:00
parent 9208c8bf18
commit 56a3db77fd
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/kern/kern_sendfile.c
View file

@ -787,7 +787,6 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
error = sendfile_getsock(td, sockfd, &sock_fp, &so);
if (error != 0)
goto out;
CURVNET_SET(so->so_vnet);
pr = so->so_proto;
#ifdef MAC
@ -817,6 +816,7 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
error = SOCK_IO_SEND_LOCK(so, SBL_WAIT | SBL_NOINTR);
if (error != 0)
goto out;
CURVNET_SET(so->so_vnet);
#ifdef KERN_TLS
tls = ktls_hold(so->so_snd.sb_tls_info);
#endif
@ -1225,6 +1225,7 @@ prepend_header:
*/
if (trl_uio != NULL) {
SOCK_IO_SEND_UNLOCK(so);
CURVNET_RESTORE();
error = kern_writev(td, sockfd, trl_uio);
if (error == 0)
sbytes += td->td_retval[0];
@ -1233,6 +1234,7 @@ prepend_header:
done:
SOCK_IO_SEND_UNLOCK(so);
CURVNET_RESTORE();
out:
/*
* If there was no error we have to clear td->td_retval[0]
@ -1270,7 +1272,6 @@ out:
#endif
if (error == ERESTART)
error = EINTR;
CURVNET_RESTORE();
return (error);
}