From nobody Wed Oct 15 18:55:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cn0dy4sDGz6CqcH; Wed, 15 Oct 2025 18:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cn0dy46NGz4F5g; Wed, 15 Oct 2025 18:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760554534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g+2KafZBQj+L1Rj1xtREf01TvACepJQPYNmID9a2s7s=; b=WDBRy3JXBklRzEigWdssd81TYliE4axmNQIgpXH5H/iQpoNL/Mt9YLt3B70ZJcIiRsuzf8 5Ym1Z4NBEuxHUzgHAqzYyG2/UgB8vIc2IvknyIFNi6VMw4xxV89lHa6nc95SQWNyFetS7w XrS9P3Fh6xZPJp51MSpitXDJCJ0q+gPtK2UVYzmUxQWbINRvN4RYN38Ck4ASta+6jXlej+ 3gAlfXfN3MF2keLG44Gv9wjVKGKIgeHNEG3jWaa5HAHepUX+AwkBrv3KmE7DJaIYowQwW+ Ilj5xkYmiqsKTouieOwqrpVLyT0YiN4AV6X/eeKuzXQAQw7sor2AErmqIZ7FkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760554534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g+2KafZBQj+L1Rj1xtREf01TvACepJQPYNmID9a2s7s=; b=pn1unqdgs/3F9z4YRMkQXGYsKzMu+DAalKrpo25otxp0+bkahLbUtcTXkAYZT2JXkFGFjI cTlNwzxO1lLMcMowr/n97O0pliIdhrczhntRHKnljARBkbNnapnmTr7qMor/C4L7XaC0UL YtkVOGnERlI7jevfmCfkCEsNWn9t8CfNnJJoE+tiBj4CDdmYxDi0sTkHqsE/NS4CrfThZV NjwDMw3oCK7ayeQgzxrHl3aMgwpSNgE3RLAzLqsJOxT+rR9l83qVPQEIZLvaiKM2cH4ZeL pqdn7glDBB0lZQjzY7SjEZDqTh7KWYENf/ZP8ijSUcJHDPkQLOvCkjH50RTAQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760554534; a=rsa-sha256; cv=none; b=LOn5TGGSSqYmRIg25E5b7o0ayWPOcqdbsc3hf9ounepqiZZnT/O4W5qc0w6vZVitlgm0nM hOAtuf0pJnf+14GbtGEC20kVe9kweTsVYAK3Xkewxq041YQiQepc6gHBXWFRCTuZ2GyWS/ Talb+I+1yIJl2oFY8cDEZvaSpMdcWTo5kl5q2qzbQF7ZZPtGqVASUz5RbT1a05ME+c9ZUJ JabTdE63IvWgLelIcDT+OZQTvOtDnA94wqpom2Gvz/0dtycz/r7nvwZKs6yntb1AGzj160 FgJ8eWZ8e8exAnBuicfMwdG3vlOqLk1rg/1vuS4FPynf6SoC0ENXY9fNVARIRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cn0dy328lzrSy; Wed, 15 Oct 2025 18:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59FItYmc072818; Wed, 15 Oct 2025 18:55:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59FItY1G072815; Wed, 15 Oct 2025 18:55:34 GMT (envelope-from git) Date: Wed, 15 Oct 2025 18:55:34 GMT Message-Id: <202510151855.59FItY1G072815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 479e29157259 - main - linux: make linux_to_bsd_sockaddr() use memory supplied by caller List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 479e29157259086c40eb61b1326299c22de5a59c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=479e29157259086c40eb61b1326299c22de5a59c commit 479e29157259086c40eb61b1326299c22de5a59c Author: Gleb Smirnoff AuthorDate: 2025-10-15 18:55:06 +0000 Commit: Gleb Smirnoff CommitDate: 2025-10-15 18:55:06 +0000 linux: make linux_to_bsd_sockaddr() use memory supplied by caller No functional change. Differential Revision: https://reviews.freebsd.org/D52936 --- sys/compat/linux/linux.c | 26 ++++++++++++++++++-------- sys/compat/linux/linux_common.h | 2 +- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 61b207070963..a40f110634f7 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -578,8 +578,13 @@ bsd_to_linux_sockaddr(const struct sockaddr *sa, struct l_sockaddr **lsa, return (0); } +/* + * If sap is NULL, then osa points at already copied in linux sockaddr that + * should be edited in place. Otherwise memory is allocated, sockaddr + * copied in and returned in *sap. + */ int -linux_to_bsd_sockaddr(const struct l_sockaddr *osa, struct sockaddr **sap, +linux_to_bsd_sockaddr(struct l_sockaddr *osa, struct sockaddr **sap, socklen_t *len) { struct sockaddr *sa; @@ -609,10 +614,12 @@ linux_to_bsd_sockaddr(const struct l_sockaddr *osa, struct sockaddr **sap, } #endif - kosa = malloc(salen, M_SONAME, M_WAITOK); - - if ((error = copyin(osa, kosa, *len))) - goto out; + if (sap != NULL) { + kosa = malloc(salen, M_SONAME, M_WAITOK); + if ((error = copyin(osa, kosa, *len))) + goto out; + } else + kosa = osa; bdom = linux_to_bsd_domain(kosa->sa_family); if (bdom == AF_UNKNOWN) { @@ -686,12 +693,15 @@ linux_to_bsd_sockaddr(const struct l_sockaddr *osa, struct sockaddr **sap, sa->sa_family = bdom; sa->sa_len = salen; - *sap = sa; - *len = salen; + if (sap != NULL) { + *sap = sa; + *len = salen; + } return (0); out: - free(kosa, M_SONAME); + if (sap != NULL) + free(kosa, M_SONAME); return (error); } diff --git a/sys/compat/linux/linux_common.h b/sys/compat/linux/linux_common.h index 97f5a259f300..814c183b338a 100644 --- a/sys/compat/linux/linux_common.h +++ b/sys/compat/linux/linux_common.h @@ -43,7 +43,7 @@ sa_family_t bsd_to_linux_domain(sa_family_t domain); #define AF_UNKNOWN UINT8_MAX int bsd_to_linux_sockaddr(const struct sockaddr *sa, struct l_sockaddr **lsa, socklen_t len); -int linux_to_bsd_sockaddr(const struct l_sockaddr *lsa, +int linux_to_bsd_sockaddr(struct l_sockaddr *lsa, struct sockaddr **sap, socklen_t *len); void linux_to_bsd_poll_events(struct thread *td, int fd, short lev, short *bev);