From patchwork Sat Aug 12 12:04:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 800883 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xV0y46tbpz9sNv for ; Sat, 12 Aug 2017 22:08:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752613AbdHLMIL (ORCPT ); Sat, 12 Aug 2017 08:08:11 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:42763 "EHLO mail.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752225AbdHLMIG (ORCPT ); Sat, 12 Aug 2017 08:08:06 -0400 Received: from mail.nwl.cc (orbyte.nwl.cc [127.0.0.1]) by mail.nwl.cc (Postfix) with ESMTP id 5F3A268252; Sat, 12 Aug 2017 14:08:05 +0200 (CEST) Received: from xsao (localhost [IPv6:::1]) by mail.nwl.cc (Postfix) with ESMTP id 41902681D7; Sat, 12 Aug 2017 14:08:05 +0200 (CEST) From: Phil Sutter To: Stephen Hemminger Cc: netdev@vger.kernel.org Subject: [iproute PATCH 28/51] nstat: Avoid passing negative fd to fdopen() Date: Sat, 12 Aug 2017 14:04:47 +0200 Message-Id: <20170812120510.28750-29-phil@nwl.cc> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170812120510.28750-1-phil@nwl.cc> References: <20170812120510.28750-1-phil@nwl.cc> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Introduce a wrapper which does the sanity checking and returns NULL in case fd is invalid. Signed-off-by: Phil Sutter --- misc/nstat.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/misc/nstat.c b/misc/nstat.c index 23e1569d7872b..c1e7ddec271e2 100644 --- a/misc/nstat.c +++ b/misc/nstat.c @@ -252,9 +252,16 @@ static void load_ugly_table(FILE *fp) } } +static FILE *fdopen_null(int fd, const char *mode) +{ + if (fd < 0) + return NULL; + return fdopen(fd, mode); +} + static void load_sctp_snmp(void) { - FILE *fp = fdopen(net_sctp_snmp_open(), "r"); + FILE *fp = fdopen_null(net_sctp_snmp_open(), "r"); if (fp) { load_good_table(fp); @@ -264,7 +271,7 @@ static void load_sctp_snmp(void) static void load_snmp(void) { - FILE *fp = fdopen(net_snmp_open(), "r"); + FILE *fp = fdopen_null(net_snmp_open(), "r"); if (fp) { load_ugly_table(fp); @@ -274,7 +281,7 @@ static void load_snmp(void) static void load_snmp6(void) { - FILE *fp = fdopen(net_snmp6_open(), "r"); + FILE *fp = fdopen_null(net_snmp6_open(), "r"); if (fp) { load_good_table(fp); @@ -284,7 +291,7 @@ static void load_snmp6(void) static void load_netstat(void) { - FILE *fp = fdopen(net_netstat_open(), "r"); + FILE *fp = fdopen_null(net_netstat_open(), "r"); if (fp) { load_ugly_table(fp);