PR/60392 CVS commit: src/sys

The following reply was made to PR bin/60392; it has been noted by GNATS.

From: "Taylor R Campbell" <[email protected]>
To: [email protected]
Cc: 
Subject: PR/60392 CVS commit: src/sys
Date: Sat, 4 Jul 2026 22:22:34 +0000

 Module Name:	src
 Committed By:	riastradh
 Date:		Sat Jul  4 22:22:33 UTC 2026
 
 Modified Files:
 	src/sys/net: if_wg.c
 	src/sys/rump/net/lib/libwg: wg_user.c wg_user.h
 
 Log Message:
 wg-userspace(8): Tighten rump interface.
 
 1. Don't abuse struct iov as a tuple of two buffers, one of which is
    conveying a sockaddr; just pass two separate arguments, one for the
    sockaddr and the other for the payload.
 
 2. Avoid sketchy struct sockaddr * scabs; we're a union shop here.
 
 It might seem like a regression to rip out all the scatter/gather
 iovecs and require contiguous buffers.  But on the input path we
 already have a contiguous buffer filled by read(2) or recvfrom(2)
 (and there would be no advantage to using readv(v)).  And on the
 output path, we always generate handshake messages and ciphertext in
 contiguous buffers anyway.  So no scatter/gather support is actually
 lost here.
 
 Cleanup prompted by:
 
 PR bin/60392: assertion "mbuflen >= sizeof(struct wg_msg)" failed
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.141 -r1.142 src/sys/net/if_wg.c
 cvs rdiff -u -r1.4 -r1.5 src/sys/rump/net/lib/libwg/wg_user.c
 cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libwg/wg_user.h
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.