From nobody Sun May 12 03:55:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1694432222; cv=none; d=zohomail.com; s=zohoarc; b=JIfIKHQv1KOkbZV1mmH3bCFdRM3Vh47m/GQKMgljtoVs0dSLInDC0015TUSpMZZJnBuLqJE02kfyLxXz6mm1VHWtBDR3y5wBvq/3wTKELU/CSwg0L/K46jUNE+DDSXq8bTeuNmTj+CrGeG7Ndogvu3ssk7y6K/pBO9i1vOGDgPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694432222; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=KuHAyp6hhtt7wHVxtVSUVb0FtgZE3yMp3a6wCg9olvY=; b=RfiI5HJ7iB7f8hYIXCedAbCBzY6Sto4p4rbTcrd1OctoC5r8jrZ3oQrRHtp0cygUBlZKb8gXLz5PVmMJprZZ+B5GTM4owizhoGU4NsdD7WxeOvj08ArSi4GbASBahnbpi1lcBmE316P7Yhb31squwDwfB3V1eF1kZzLNb8ZA8oY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1694432222533220.03504489005968; Mon, 11 Sep 2023 04:37:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qffDO-0002XO-M9; Mon, 11 Sep 2023 07:36:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qffDM-0002XF-Sg for qemu-devel@nongnu.org; Mon, 11 Sep 2023 07:36:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qffDK-0000gL-JL for qemu-devel@nongnu.org; Mon, 11 Sep 2023 07:36:24 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-226-SeSufxbbOremzaUUytg-Sw-1; Mon, 11 Sep 2023 07:36:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0A26C1C29786; Mon, 11 Sep 2023 11:36:18 +0000 (UTC) Received: from localhost (unknown [10.39.208.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2754040C6EA8; Mon, 11 Sep 2023 11:36:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694432181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KuHAyp6hhtt7wHVxtVSUVb0FtgZE3yMp3a6wCg9olvY=; b=i3oe3KfVVcitrlD/1KZFPDNYnoxB0+rsxxNNYzMy3d9labuSbh6bYTXZYdCvrzTt70sN0Q fO3xTzfVWm/Mr1SJOPYI+WL3R6mNvaDejREbj8/3eRfKy4LIsdqwJw4zGLNG2BIBvRo1Bi FZ+zdEz3Fuhx39+Mx5zmPuFJUPdRDBI= X-MC-Unique: SeSufxbbOremzaUUytg-Sw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefan Berger Subject: [PATCH] tpm: fix crash when FD >= 1024 Date: Mon, 11 Sep 2023 15:36:14 +0400 Message-ID: <20230911113614.1412887-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694432222936100001 From: Marc-Andr=C3=A9 Lureau Replace select() with poll() to fix a crash when QEMU has a large number of FDs. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D2020133 Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Michael Tokarev Reviewed-by: Stefan Berger --- backends/tpm/tpm_util.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c index a6e6d3e72f..5f4c9f5b6f 100644 --- a/backends/tpm/tpm_util.c +++ b/backends/tpm/tpm_util.c @@ -112,12 +112,9 @@ static int tpm_util_request(int fd, void *response, size_t responselen) { - fd_set readfds; + GPollFD fds[1] =3D { {.fd =3D fd, .events =3D G_IO_IN } }; int n; - struct timeval tv =3D { - .tv_sec =3D 1, - .tv_usec =3D 0, - }; + int timeout =3D 1000; =20 n =3D write(fd, request, requestlen); if (n < 0) { @@ -127,11 +124,8 @@ static int tpm_util_request(int fd, return -EFAULT; } =20 - FD_ZERO(&readfds); - FD_SET(fd, &readfds); - /* wait for a second */ - n =3D select(fd + 1, &readfds, NULL, NULL, &tv); + n =3D RETRY_ON_EINTR(g_poll(fds, 1, timeout)); if (n !=3D 1) { return -errno; } --=20 2.41.0