From patchwork Tue Sep 20 09:09:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liping Zhang X-Patchwork-Id: 672162 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sdcQG4rjdz9s4x for ; Tue, 20 Sep 2016 19:09:26 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=dK2rCdyh; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753801AbcITJJX (ORCPT ); Tue, 20 Sep 2016 05:09:23 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:33700 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752089AbcITJJV (ORCPT ); Tue, 20 Sep 2016 05:09:21 -0400 Received: by mail-pa0-f66.google.com with SMTP id oz2so668433pac.0 for ; Tue, 20 Sep 2016 02:09:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=q/FDw1V7cviQlNXOLzSrMKTLJYApehUtzAfQ3oOzBzU=; b=dK2rCdyhULQTIaj/q0R0mPSVKjEK3zz0hWKtp9tjwbq3s1NMMGKhS6AyEL6lAFyZ0E fS6PzSeFEgF1EVVMI4gXtAZwu/xWVW4j7CdVZ6dgjI3W4VslImAzpKGhIdIV4p61XUYw PhuvObM+3bt5FqgHUb8cX2wXM2V0DxdhQrik0Cteg+xRHtJ38V2L8rqZlRlWLPgDe+5K svuJdgh9f/6bEBuCP1rN3DSq3Skbh60rMloigwlecvFFtjtclsIHnvPHPwUXfDER1LmS hRAUjuB+JMWpS+W4WDpw4NlnpZJP0KocbRbLlRfp6ZASfwu9AdMiJMWOsvHX2xnx/0ef F5uQ== 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=q/FDw1V7cviQlNXOLzSrMKTLJYApehUtzAfQ3oOzBzU=; b=gXgwlhai/uEZ+G/B74ykqNf5yThOe7ESJv3u06CrdK5WUXMZtGD2OONa7t9wKU7UJQ sva6qHSDRv/B+KDcr8K0ta+Rov4BFlXlkcm1gAdocHPVzjjL7H78C++n3GyjLa8v0Ehb Tkx1xOxWbz5tLIUHz0IKteJ8agrpueu25clmqRFsHSk+JO4uhY6xeFs967Cy4YsW5LIg MJ2SuIemmCFICfNmzDj9A0t6GU/9lNfIWNqJFK5oCsmVvzDqqOMLn4uOcwH+aeZQ309m 3THLBXiDjIfXZ8JWJ5wWzqUl577gS+MgQrRmc3nls3jQRHwNxI3Ig6cETdzyqkUnYlVG urJg== X-Gm-Message-State: AE9vXwOXfBAUjszyK0d/M8XhEAUBNR0izWKTz3HodCdxJ00LVwU+fNXS8s7pyAiBb5ldiQ== X-Received: by 10.66.100.225 with SMTP id fb1mr54041983pab.4.1474362560278; Tue, 20 Sep 2016 02:09:20 -0700 (PDT) Received: from ubuntu.localdomain ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id i7sm37372494paf.9.2016.09.20.02.09.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Sep 2016 02:09:19 -0700 (PDT) From: Liping Zhang To: stephen@networkplumber.org Cc: netdev@vger.kernel.org, nicolas.dichtel@6wind.com, Liping Zhang Subject: [PATCH iproute2] ipmonitor: fix ip monitor can't work when NET_NS is not enabled Date: Tue, 20 Sep 2016 02:09:02 -0700 Message-Id: <1474362542-5506-1-git-send-email-zlpnobody@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Liping Zhang In ip monitor, netns_map_init will check getnsid is supported or not. But when /proc/self/ns/net does not exist, we just print out error messages and exit. So user cannot use ip monitor anymore when CONFIG_NET_NS is disabled: # ip monitor open("/proc/self/ns/net"): No such file or directory If open "/proc/self/ns/net" failed, set have_rtnl_getnsid to false. Fixes: d652ccbf8195 ("netns: allow to dump and monitor nsid") Signed-off-by: Liping Zhang Acked-by: Nicolas Dichtel --- ip/ipnetns.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ip/ipnetns.c b/ip/ipnetns.c index af87065..ccc652c 100644 --- a/ip/ipnetns.c +++ b/ip/ipnetns.c @@ -72,8 +72,8 @@ static int ipnetns_have_nsid(void) if (have_rtnl_getnsid < 0) { fd = open("/proc/self/ns/net", O_RDONLY); if (fd < 0) { - perror("open(\"/proc/self/ns/net\")"); - exit(1); + have_rtnl_getnsid = 0; + return 0; } addattr32(&req.n, 1024, NETNSA_FD, fd);