From nobody Thu Dec 16 10:53:18 2021 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 4C8C318F0D79; Thu, 16 Dec 2021 10:53:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JF89B72Zpz4fC2; Thu, 16 Dec 2021 10:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D14862ECAB; Thu, 16 Dec 2021 10:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BGArIq7091073; Thu, 16 Dec 2021 10:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BGArI9U091072; Thu, 16 Dec 2021 10:53:18 GMT (envelope-from git) Date: Thu, 16 Dec 2021 10:53:18 GMT Message-Id: <202112161053.1BGArI9U091072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: bf07f2f8623d - main - loader: tftp: Don't error on tftp error 0 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf07f2f8623d5e29e814b9dc49a0cdff920778c3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639651999; 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=DLVe6LH6Lmut0a7TR8puupm546zAI+1/MKAj4uiPZ6Q=; b=xb7SqKa55tnr9PBcCTwtBUDMtdCdlVWI2IJsvKBZdUCPAPLM8p55ZPMxNP49S8vRzdWoIm 3yj9KFbOniGDjV99NrE25aKWBinEl9UHqHjB0IUiWKZNNjjIGsoPBgEohKlbBRDIAFWiDa 90QPp0AO10i7VwdqcBV/zXVpPKJhPfrgFl8OtbviWa8nQvCAh6HTOpw/QtxbWEnxHaLIC+ C0Z65AdQ1KyATSi+FFd4y0c8LmTW0S6jbd5JEsEaoAgPVOtZl6RHLEpXUZyjxxtMP+Pj0M K0eQaoDhGa2V7KFr8Gq9jRHydkTwiXi6kQDWEXYDsVC84/IK9kIewJwZtcztdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639651999; a=rsa-sha256; cv=none; b=sTNK3hjncXG305d6rICx1Q8FG6u6m3z6nPRRoT+38IwYPijeuCPJmOwqfWmycbwkpMPl6x hCVA3Eoz4FUmwLrHbLdgDeG9J1Js2OmdrJE1eetJwHuvTFM0kXK6QJtjbmIiv5ynskcD1f f6CUQCsQ+vtPSmZdmszjmvj4dMrkqhgbAXAFg1ynDTrGA8NdGAxfVqOrQoG+PhzKDTl+7b /sZt4EMApcy4vpHiYXr7PUDzDthwQqQsOXmd1iuhUuupvpavkOL9bQNvc58XWKZASAjP2F RREKl9t9LYkFkp7/MundFVzipfcr5N7bkoaZ0r7u0COCc6hCsyskuuUdgXjP/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=bf07f2f8623d5e29e814b9dc49a0cdff920778c3 commit bf07f2f8623d5e29e814b9dc49a0cdff920778c3 Author: Emmanuel Vadot AuthorDate: 2021-12-08 15:18:49 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-16 10:50:29 +0000 loader: tftp: Don't error on tftp error 0 tftp-hpa sends NAK with tftp error set to 0 when trying to get a directory and this is the first thing that loader tries to do and this make it hangs. Reviewed by: imp, tsoome MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33406 --- stand/libsa/tftp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/stand/libsa/tftp.c b/stand/libsa/tftp.c index 01f5753a2163..80156cf95ef0 100644 --- a/stand/libsa/tftp.c +++ b/stand/libsa/tftp.c @@ -122,7 +122,7 @@ struct tftprecv_extra { #define TFTP_MAX_ERRCODE EOPTNEG static const int tftperrors[TFTP_MAX_ERRCODE + 1] = { - 0, /* ??? */ + 0, /* NAK */ ENOENT, EPERM, ENOSPC, @@ -188,6 +188,7 @@ recvtftp(struct iodesc *d, void **pkt, void **payload, time_t tleft, struct tftphdr *t; void *ptr = NULL; ssize_t len; + int tftp_error; errno = 0; extra = recv_extra; @@ -234,16 +235,20 @@ recvtftp(struct iodesc *d, void **pkt, void **payload, time_t tleft, return (got); } case ERROR: - if ((unsigned)ntohs(t->th_code) > TFTP_MAX_ERRCODE) { - printf("illegal tftp error %d\n", ntohs(t->th_code)); + tftp_error = ntohs(t->th_code); + if ((unsigned)tftp_error > TFTP_MAX_ERRCODE) { + printf("illegal tftp error %d\n", tftp_error); errno = EIO; } else { #ifdef TFTP_DEBUG - printf("tftp-error %d\n", ntohs(t->th_code)); + printf("tftp-error %d\n", tftp_error); #endif - errno = tftperrors[ntohs(t->th_code)]; + errno = tftperrors[tftp_error]; } free(ptr); + /* If we got a NAK return 0, it's usually a directory */ + if (tftp_error == 0) + return (0); return (-1); case OACK: { struct udphdr *uh;