From nobody Fri May 22 17:58:07 2026 X-Original-To: dev-commits-src-all@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 4gMY0c12Nlz6fLjL for ; Fri, 22 May 2026 17:58:08 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gMY0b5LbVz4MwG for ; Fri, 22 May 2026 17:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779472687; 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=ELZqqGr5tMyv6JYMKZ9oqeuelFp815Z1c4BUBhgROrs=; b=ffKXpjU2V2CNit3By7pUhAzYf3WhD6qF9ZqweCTaxDBDrs7u5UsIcBrdzMtmSNVVfEuf4c vmxtTM/yEl50ctjrqRlWzByv52egfhTgtwN0Tca9TMYrKoOlLTQnb5pvZo8yW+F7c2jAtr UldeZzkRZVsnsHYtpWvTf43QG+YivJ+2fbRBk69oNXm7uZJ+16X2TU8uKcfBvi/c/oz5O/ HTGKIgXHB6v5GuW5upSAiOM6B2S3bistpv4Vv7FMgVm751KhwMoH5BMl9hZe1IbVoTKthC BTaeXBpHxUb15PeDOEGj0f3O9r3t9KKMbx9dNDTWTQRKwg0ETLhoEqgYm7cplA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779472687; a=rsa-sha256; cv=none; b=qoF8ONJ9gKXosurSF4XFiU43Ko2cSegmsfZE/7YylFa0AuEWvCwDYho9QQxNDjzpwvYMav cJrYsgsQvtuoCEzTuRYyqHgf0o9H5fAn00DWwW5TN/5U8f7selCfTIPTdrOrNI2hK8eNKH JPZ3Jg53ykFhCHVlAvGkjpFt1SoDev7MNCRvYSG9eYacK0JrxoOaqgFLkUm89mM9JbrGeN AX5yWWQP+w2CTAOJ8OkCijU+n8VFJhzdQo7Pq/790KUNxH5OOMlEi6WVyK6RNQkMb/sTdE VjgPJXd24S7C8JclKnXuiLVOxDsdcuFXRVJnNhsrNGksbEIrEx6wzsF36ZVPyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779472687; 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=ELZqqGr5tMyv6JYMKZ9oqeuelFp815Z1c4BUBhgROrs=; b=wEPtAjbF5s8yWgpxT2iM8V25f7ylqJQT+6+aiNV0Z3Ff67eGejQIujdAxiyKQaqzumpm/n uGUFWYNLQ/BmL1cn4Ks2kL1t59obhonu4Uobf3wV1hCw7GBIjbgVSAtogzjfD10pV2SGX0 NHJkTTLqYjop+C8dQ1F+R3jEL3k+db8RVLYzULWgY/61WiPnE1WwlBahqvKJukLY4RG1kg d7N9xIDvdLFjzNbA/2YgTArUZk1kauYZRoCtXaLSxuttlLn+Mg1Nkjs7JYvt+efqFk9FI1 +j6O83hWd6Qk/PSEJICHGpi0b259jPd49J7tyJ9Iah5aqUTnoSermRQZVCHQRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gMY0b4grdzXTb for ; Fri, 22 May 2026 17:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37579 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 22 May 2026 17:58:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 47e4571df158 - main - tftp: Fix handling of port name or number List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47e4571df15804fe2b010a3c82b22691d80ee680 Auto-Submitted: auto-generated Date: Fri, 22 May 2026 17:58:07 +0000 Message-Id: <6a10992f.37579.3f873412@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=47e4571df15804fe2b010a3c82b22691d80ee680 commit 47e4571df15804fe2b010a3c82b22691d80ee680 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-22 17:57:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-22 17:57:16 +0000 tftp: Fix handling of port name or number MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D57105 --- usr.bin/tftp/main.c | 7 ++++--- usr.bin/tftp/tftp.c | 40 ++++++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c index a26561eaa982..02a84f864071 100644 --- a/usr.bin/tftp/main.c +++ b/usr.bin/tftp/main.c @@ -331,6 +331,8 @@ setpeer0(char *host, const char *lport) } freeaddrinfo(res0); + free(port); + port = strdup(lport); } static void @@ -350,10 +352,9 @@ setpeer(int argc, char *argv[]) printf("usage: %s [host [port]]\n", argv[0]); return; } - if (argc == 3) { - port = argv[2]; + if (argc == 3) setpeer0(argv[1], argv[2]); - } else + else setpeer0(argv[1], NULL); } diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c index 31a22f416135..e5c307a572fb 100644 --- a/usr.bin/tftp/tftp.c +++ b/usr.bin/tftp/tftp.c @@ -64,8 +64,9 @@ int xmitfile(int peer, char *port, int fd, char *name, char *mode) { struct tftphdr *rp; + struct servent *se; int n, i, ret = 0; - uint16_t block; + uint16_t block, portn; struct sockaddr_storage serv; /* valid server port number */ char recvbuffer[MAXPKTSIZE]; struct tftp_stats tftp_stats; @@ -75,14 +76,15 @@ xmitfile(int peer, char *port, int fd, char *name, char *mode) memset(&serv, 0, sizeof(serv)); rp = (struct tftphdr *)recvbuffer; - if (port == NULL) { - struct servent *se; - se = getservbyname("tftp", "udp"); - assert(se != NULL); - ((struct sockaddr_in *)&peer_sock)->sin_port = se->s_port; - } else - ((struct sockaddr_in *)&peer_sock)->sin_port = - htons(atoi(port)); + if ((se = getservbyname(port ? port : "tftp", "udp")) != NULL) + portn = se->s_port; + else + portn = htons(atoi(port)); + if (portn == 0) { + printf("Invalid port '%s'.\n", port ? port : "tftp"); + return -1; + } + ((struct sockaddr_in *)&peer_sock)->sin_port = portn; for (i = 0; i < 12; i++) { struct sockaddr_storage from; @@ -166,7 +168,8 @@ int recvfile(int peer, char *port, int fd, char *name, char *mode) { struct tftphdr *rp; - uint16_t block; + struct servent *se; + uint16_t block, portn; char recvbuffer[MAXPKTSIZE]; int n, i, ret = 0; struct tftp_stats tftp_stats; @@ -175,14 +178,15 @@ recvfile(int peer, char *port, int fd, char *name, char *mode) rp = (struct tftphdr *)recvbuffer; - if (port == NULL) { - struct servent *se; - se = getservbyname("tftp", "udp"); - assert(se != NULL); - ((struct sockaddr_in *)&peer_sock)->sin_port = se->s_port; - } else - ((struct sockaddr_in *)&peer_sock)->sin_port = - htons(atoi(port)); + if ((se = getservbyname(port ? port : "tftp", "udp")) != NULL) + portn = se->s_port; + else + portn = htons(atoi(port)); + if (portn == 0) { + printf("Invalid port '%s'.\n", port ? port : "tftp"); + return (-1); + } + ((struct sockaddr_in *)&peer_sock)->sin_port = portn; for (i = 0; i < 12; i++) { struct sockaddr_storage from;