From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=haytok.jp Authentication-Results: passt.top; dkim=pass (2048-bit key; unprotected) header.d=haytok.jp header.i=@haytok.jp header.a=rsa-sha256 header.s=sig1 header.b=fUxXdq/7; dkim-atps=neutral Received: from outbound.mr.icloud.com (mr-2003e-snip4-11.eps.apple.com [57.103.69.93]) by passt.top (Postfix) with ESMTPS id 2C8295A0262 for ; Thu, 16 Jul 2026 19:21:30 +0200 (CEST) Received: from outbound.mr.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-2a-20-percent-0 (Postfix) with ESMTPS id 439291800196; Thu, 16 Jul 2026 17:21:27 +0000 (UTC) X-ICL-RepId: 019f6bf2-92a4-7b2b-b358-6cc025aa1228 X-ICL-Out-Info: HUtFAUMHWwJACUgATUQeDx5WFlZNRAJCTQhNAEMFXwReC0gHQwZSClBcHA4JUh1yGFgBRwJcRVgAGR5XUF8KSwRWEx0HR0tAEwRKEwVSB11NVg1HD1geXBQXFUFDXgheH0wcHQ5YBhIATQoONgZZBV4JVgNDBTYSFF1FWwxOH10bFxJDTVoCVk0FSgNfAVsFQQ9JBF8GWQNeAUgBXAFGA11dHUUtXwpLBFYTHQdHVRIEQAhWUFQeQQRWFWwJWAZTGVc= Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=haytok.jp; s=sig1; t=1784222488; x=1786814488; bh=FQeIw5XJpA3iyduBSLX3E7rBDR/gq9BdAPIzubpRJic=; h=From:To:Subject:Date:Message-Id:MIME-Version:x-icloud-hme; b=fUxXdq/7KGEj84lwxa9tndnm2KnoJ8KzuxwJpEPNpe2uldJnHL1zSKdx4XWFX1SDeD1/NEClt/UUM7YgI7tuJC1BcjTS/zossxbz0MCwUKH5MZTQbJLu6FY7+ONXweMj52plMCPVQt350+kIua+AncFfDqTsXEA0DRXSaTvAQ5sZtKOjJ22fStBjNAtQbArRcVHfnrArcxiR39hvteqK6H3kJHS0/V6eqHLkqtCj7xVUHSb0utrw1EbCVraRCRV1yD3Cc08tfs7J+ssQ0RXGEJkT90t1Kw1mE37bb6TOJsFE280wbf4xIIY6cRULK8AeZ0QBL8xs2BzlRZ+iqLMjbg== mail-alias-created-date: 1766251435121 Received: from localhost.localdomain (unknown [17.57.152.38]) by p00-icloudmta-asmtp-us-west-2a-20-percent-0 (Postfix) with ESMTPSA id 3099B1800DD4; Thu, 16 Jul 2026 17:21:26 +0000 (UTC) From: Hayato Kiwata To: passt-dev@passt.top Subject: [PATCH] tap: Fix EAGAIN/EWOULDBLOCK check in tap_pasta_input() Date: Fri, 17 Jul 2026 02:21:21 +0900 Message-Id: <20260716172121.80216-1-dev@haytok.jp> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: mT0OKnDjGyBt9qu7Ajm299DAN4r4UOIp X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDE3OCBTYWx0ZWRfX245zJb/WnnG8 zA/E+E4Ack6OADgCe1ajjvBFpqLQ3ds8ES8oDt0++No66PcjyrNGcJiFSywZcilomScXi++MXqd /FHqgqi4rqK4+KiEGGURLCOLct5FPidXQRn9FWVxLcUvBlQcr46W9gFwQSXiieOMHCqroNVT8np Cc55V/zWIBD2hvqMg6gxTPP/mU1F8Aj9M+E+rfrVSyp31INUjoFxFdm/NsyBXCFwRZKIUyYcorS Kzhq1UEOan3elySeIj7CVKdDUZrE9GWJQVPSUNOHQ2v10bdXewlh+tdIJvmIcUR1OvNL2WhkdW4 WUvY25n8OeMz5UQS632 X-Proofpoint-ORIG-GUID: mT0OKnDjGyBt9qu7Ajm299DAN4r4UOIp X-MailFrom: dev@haytok.jp X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation Message-ID-Hash: WVEMXTXK5YYQXAMNLKARF77XNACS4Q4V X-Message-ID-Hash: WVEMXTXK5YYQXAMNLKARF77XNACS4Q4V X-Mailman-Approved-At: Thu, 16 Jul 2026 19:27:20 +0200 CC: Hayato Kiwata X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On Linux, EAGAIN and EWOULDBLOCK have the same value. Commit d2a1dc744b10 ("tap: Restructure in tap_pasta_input()") added a check for EWOULDBLOCK on purpose: > - Check for EWOULDBLOCK as well as EAGAIN for the benefit of any future > ports where those might not have the same value However, the condition uses && instead of ||, so it can never be true on a platform where EAGAIN and EWOULDBLOCK are different. Use || instead so that the check works as intended on such platforms. Fixes: d2a1dc744b10 ("tap: Restructure in tap_pasta_input()") Signed-off-by: Hayato Kiwata --- tap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tap.c b/tap.c index d418961..cf87591 100644 --- a/tap.c +++ b/tap.c @@ -1329,7 +1329,7 @@ static void tap_pasta_input(struct ctx *c, const struct timespec *now) continue; } - if (errno == EAGAIN && errno == EWOULDBLOCK) + if (errno == EAGAIN || errno == EWOULDBLOCK) break; /* all done for now */ die("Error on tap device, exiting"); -- 2.39.5 (Apple Git-154)