From patchwork Sun Jul 3 06:20:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Zaman X-Patchwork-Id: 9211185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B9B4660752 for ; Sun, 3 Jul 2016 06:21:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0538285BF for ; Sun, 3 Jul 2016 06:21:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92AE4285CF; Sun, 3 Jul 2016 06:21:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from emsm-gh1-uea10.nsa.gov (emsm-gh1-uea10.nsa.gov [8.44.101.8]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 86461285BF for ; Sun, 3 Jul 2016 06:21:29 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.26,567,1459814400"; d="scan'208";a="15233383" IronPort-PHdr: =?us-ascii?q?9a23=3AZhXe/BF8L/eiviF+QYysWJ1GYnF86YWxBRYc798d?= =?us-ascii?q?s5kLTJ75o8WwAkXT6L1XgUPTWs2DsrQf2rKQ6firAzJYqb+681k6OKRWUBEEjc?= =?us-ascii?q?hE1ycBO+WiTXPBEfjxciYhF95DXlI2t1uyMExSBdqsLwaK+i760zceF13FOBZv?= =?us-ascii?q?IaytQ8iJ3pzxjbj5ocOLKyxzxxOFKYtoKxu3qQiD/uI3uqBFbpgL9x3Sv3FTcP?= =?us-ascii?q?5Xz247bXianhL7+9vitMU7q3cYhuglv/Jkfe26Ov1gDO8QMDNzKG0x5cv2pTHf?= =?us-ascii?q?XACP4T0aSWxQnR1WUCbf6xSvfJ7qtS2yhON40S/Sac//VrcycSyv9alqTh7vjm?= =?us-ascii?q?EMMDtvozKfsdB5kK8O+EHpnBd42YOBJdjNOQ=3D=3D?= X-IPAS-Result: =?us-ascii?q?A2GhBQAhrnhX/wHyM5BbgxEtgVK7JCKBd4UrTAEBAQEBAQI?= =?us-ascii?q?CYieCMoEDWz8BBAIPKAYBAQwgDAIDCQIXKQgIAwEtAwEFAQsfCwUYBAGIDgGkW?= =?us-ascii?q?4ExPjGKVIUqAQEFizEIEIQMimkCEQFohQ+OfIocjklkiFclhUYCSI4DMIEPVIN?= =?us-ascii?q?9YQGIDg8XgR4BAQE?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea10.nsa.gov with ESMTP; 03 Jul 2016 06:21:26 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u636KXSU017869; Sun, 3 Jul 2016 02:20:42 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u636KU7U172915 for ; Sun, 3 Jul 2016 02:20:30 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u636KTHc017866 for ; Sun, 3 Jul 2016 02:20:29 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1AJAgAhrnhXesTAVdFbgxGBf7cnhAiGGIEhTAEBAQEBARMBAQkLDAghhH4BFS4BATcBgRQBBQE1IogOAaRbgTE+MYpUhSoBAQWLMQgQhAyKaXyBfQuDB458ihyOSWSIV4VrAkiOAzCBD4RRYQGIDoFEAQEB X-IPAS-Result: A1AJAgAhrnhXesTAVdFbgxGBf7cnhAiGGIEhTAEBAQEBARMBAQkLDAghhH4BFS4BATcBgRQBBQE1IogOAaRbgTE+MYpUhSoBAQWLMQgQhAyKaXyBfQuDB458ihyOSWSIV4VrAkiOAzCBD4RRYQGIDoFEAQEB X-IronPort-AV: E=Sophos;i="5.26,567,1459828800"; d="scan'208";a="5556510" Received: from emsm-gh1-uea10.corp.nsa.gov (HELO emsm-gh1-uea10.nsa.gov) ([10.208.41.36]) by goalie.tycho.ncsc.mil with ESMTP; 03 Jul 2016 02:20:28 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AsR7ZCBS+owX+mBKtPekQHC6KpNpsv+yvbD5Q0YIu?= =?us-ascii?q?jvd0So/mwa64ZxCN2/xhgRfzUJnB7Loc0qyN4vimAzRLu8jZ+Fk5M7V0Hycfjs?= =?us-ascii?q?sXmwFySOWkMmbcaMDQUiohAc5ZX0Vk9XzoeWJcGcL5ekGA6ibqtW1aJBzzOEJP?= =?us-ascii?q?K/jvHcaK1oLshrj0ocWYOVsQzBOGIppKZC2sqgvQssREyaBDEY0WjiXzn31TZu?= =?us-ascii?q?5NznlpL1/A1zz158O34YIxu38I46FppIZ8VvDhcqA5S6FIJCg3OGAyosvwvF/M?= =?us-ascii?q?ShXcyGEbVzA0mwFPBUD35RTzWN+lsCLhsexVwCSAM8zwTLcyHz+l6vE4G1fTlC?= =?us-ascii?q?4bOmthoynsgctqgfcDrQ=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0EFAwAhrnhXesTAVdFbgxGBf7cnhAiCD?= =?us-ascii?q?oQKgSFMAQEBAQEBAgIPAQEJCwwIIS+CMoEDWz8BFS4BATcBgRQBBQE1IogOAaR?= =?us-ascii?q?bgTE+MYpUhSoBAQWLMQgQhAyKaXyBfQuDB458ihyOSWSIV4VrAkiOAzCBD4RRY?= =?us-ascii?q?QGIDoFEAQEB?= X-IPAS-Result: =?us-ascii?q?A0EFAwAhrnhXesTAVdFbgxGBf7cnhAiCDoQKgSFMAQEBAQE?= =?us-ascii?q?BAgIPAQEJCwwIIS+CMoEDWz8BFS4BATcBgRQBBQE1IogOAaRbgTE+MYpUhSoBA?= =?us-ascii?q?QWLMQgQhAyKaXyBfQuDB458ihyOSWSIV4VrAkiOAzCBD4RRYQGIDoFEAQEB?= X-IronPort-AV: E=Sophos;i="5.26,567,1459814400"; d="scan'208";a="15233379" Received: from mail-pf0-f196.google.com ([209.85.192.196]) by emsm-gh1-uea10.nsa.gov with ESMTP/TLS/AES128-GCM-SHA256; 03 Jul 2016 06:20:27 +0000 Received: by mail-pf0-f196.google.com with SMTP id 66so13571394pfy.1 for ; Sat, 02 Jul 2016 23:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=perfinion-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=pUd3F+IxdJPbYUvW3UhgdaGyiSHYSLohOq/BtgQo8fY=; b=wa62EBW8qrPMhmFmmIJcxxudet5e/SjLf5cZibQZITnkWdlf1uRs202py6RScnveTw mgHNW3jF7uG1ICbh5gOQxJuMgIE9HFi5HpG6hmgp/T59JrlAwrndHfF14Ey5M6/ELn7J ZZ69ET5y9hdNIcgXVn2a9mRTZpB263oTBnnOeuU1dCFXeiWNMC5WRbA77m0YUtIXkbC6 8fK1Vr2XAEebcSSRWLOLyRsG3IRcG16qw4ERVewoDXyyQFHbWzoHDiW0KNA7JY+QH+aY ytqYJ3nKcViYxw5mKa8sQZdaiQANNEnTgAIgVWxVU7PVLma0y/dskKV/5OZ0fVpRJNqO Lc9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pUd3F+IxdJPbYUvW3UhgdaGyiSHYSLohOq/BtgQo8fY=; b=OyCTb/dQWo4rvt2XA7w99cUV7OjL1FHnjzLOZ8q/iiztIdxCOyYzHKEJx/dZY+lDKl kVxDHz4k5owSZPGxJ2SLdQuxBuwFVKJZWBDOqDvXzUY9iqB9b9KGXmaIclarb3zWqzQn nzuBsydNOJdgV3r77S7twRr1VCJBIhRLb6WBDQHqixptrDa4CuwyShbz07NNtZTxCOlq RyAZVksAyS6++XN7WYD5XSG55OiF3Dz6BxhJXQt+KOQNr4CWb+KMkJIscgWuPvlmry5k 9HTE7bWoE8/MaSj3i4pbO2C1kVHTHc5ltfalEKo3HIMmperQ6AZKYPGquqMLZ/p8OMhO Os1g== X-Gm-Message-State: ALyK8tKjT01/mOQdsV6k8apLKTE7Ag6mZDrjmoZUys6NKdx8V4SNYkaZIrESyPczv2T20g== X-Received: by 10.98.22.198 with SMTP id 189mr11552465pfw.74.1467526826750; Sat, 02 Jul 2016 23:20:26 -0700 (PDT) Received: from localhost ([2404:e800:e600:9ab:55de:35ce:f10:570b]) by smtp.gmail.com with ESMTPSA id tm1sm607214pac.23.2016.07.02.23.20.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jul 2016 23:20:26 -0700 (PDT) From: Jason Zaman To: selinux@tycho.nsa.gov Subject: [PATCH] open_init_pty: Do not error on EINTR Date: Sun, 3 Jul 2016 14:20:22 +0800 Message-Id: <1467526822-19491-1-git-send-email-jason@perfinion.com> X-Mailer: git-send-email 2.7.3 X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP There is a signal handler so that the select returns EINTR when the child exits. EINTR is used to then clean up and flush the remaining buffers. It should not error. Signed-off-by: Jason Zaman --- policycoreutils/run_init/open_init_pty.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/policycoreutils/run_init/open_init_pty.c b/policycoreutils/run_init/open_init_pty.c index 37805bf..6e25ea3 100644 --- a/policycoreutils/run_init/open_init_pty.c +++ b/policycoreutils/run_init/open_init_pty.c @@ -327,8 +327,9 @@ int main(int argc, char *argv[]) break; } + errno = 0; int select_rc = select(pty_master + 1, &readfds, &writefds, NULL, NULL); - if (select_rc < 0) { + if (select_rc < 0 && errno != EINTR) { perror("select()"); exit(EX_IOERR); }