From patchwork Mon Jan 26 10:25:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 432706 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C74971401AC for ; Mon, 26 Jan 2015 21:25:56 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3F3EC2804B1; Mon, 26 Jan 2015 11:23:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id C0A70289C94 for ; Mon, 26 Jan 2015 11:23:19 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 26 Jan 2015 11:23:18 +0100 (CET) Received: by mail-wi0-f178.google.com with SMTP id em10so8687509wid.5 for ; Mon, 26 Jan 2015 02:25:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=FNMcNjRDIBk/J9XWyefM4YHuXpU2Ne9dmMdWHt9dD0A=; b=lSSZP1Zo4gjf+nr53iFkSzhIAFjd49OiltTU4/0VQxjlQ3d5ZxIXU6yot1rVFON7dg apJGKwfT+y0ujfOS7dMgkBNkUZsMzsoFp4n2nI2Upz7edy5QhuuYk4Nv0KR9mSBafUZL SX8J920+nFSu43K2sGTO+9Y62Oyv105rl2aFoqI8QdEVI5zon8oitI5R71nimRZcPyeA OfCYPGoJKGAiYFjzVgu2WSoukzvNBfnKo0nIydzwOiPLTX81WZxy602+3SwybKk/sd/7 W7oxZJF68RFIAzfSFzPXmC5aK/RNJX9mmk6tB0riUUXaqtdfQDsVLC/OZ2311L/WXius d/Jw== X-Received: by 10.194.60.77 with SMTP id f13mr21401877wjr.105.1422267942696; Mon, 26 Jan 2015 02:25:42 -0800 (PST) Received: from linux-tdhb.lan (static-91-227-21-4.devs.futuro.pl. [91.227.21.4]) by mx.google.com with ESMTPSA id qg11sm13292700wic.17.2015.01.26.02.25.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jan 2015 02:25:41 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Felix Fietkau , John Crispin Date: Mon, 26 Jan 2015 11:25:33 +0100 Message-Id: <1422267933-5240-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH libubox] uloop: ignore SIGPIPE by default X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Most app don't want to crash because of unhandled SIGPIPE. It could happen is such trivial situations like writing to socket. Signed-off-by: Rafał Miłecki --- uloop.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/uloop.c b/uloop.c index 9a77ce4..7d11bbc 100644 --- a/uloop.c +++ b/uloop.c @@ -582,6 +582,21 @@ static void uloop_install_handler(int signum, void (*handler)(int), struct sigac sigaction(signum, act, NULL); } +static void uloop_ignore_signal(int signum, bool ignore) +{ + struct sigaction s; + + sigaction(signum, NULL, &s); + + if (ignore) { + if (s.sa_handler == SIG_DFL) /* Ignore only if there isn't any custom handler */ + signal(signum, SIG_IGN); + } else { + if (s.sa_handler == SIG_IGN) /* Restore only if noone modified our SIG_IGN */ + signal(signum, SIG_DFL); + } +} + static void uloop_setup_signals(bool add) { static struct sigaction old_sigint, old_sigchld, old_sigterm; @@ -589,6 +604,8 @@ static void uloop_setup_signals(bool add) uloop_install_handler(SIGINT, uloop_handle_sigint, &old_sigint, add); uloop_install_handler(SIGTERM, uloop_handle_sigint, &old_sigterm, add); uloop_install_handler(SIGCHLD, uloop_sigchld, &old_sigchld, add); + + uloop_ignore_signal(SIGPIPE, add); } static int uloop_get_next_timeout(struct timeval *tv)