From patchwork Sat Aug 12 12:04:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 800888 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 3xV0yf6PPGz9t3C for ; Sat, 12 Aug 2017 22:08:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752563AbdHLMIj (ORCPT ); Sat, 12 Aug 2017 08:08:39 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:57081 "EHLO mail.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751400AbdHLMIh (ORCPT ); Sat, 12 Aug 2017 08:08:37 -0400 Received: from mail.nwl.cc (orbyte.nwl.cc [127.0.0.1]) by mail.nwl.cc (Postfix) with ESMTP id B048568252; Sat, 12 Aug 2017 14:08:36 +0200 (CEST) Received: from xsao (localhost [IPv6:::1]) by mail.nwl.cc (Postfix) with ESMTP id 9506C681D7; Sat, 12 Aug 2017 14:08:36 +0200 (CEST) From: Phil Sutter To: Stephen Hemminger Cc: netdev@vger.kernel.org Subject: [iproute PATCH 33/51] ss: Don't leak fd in tcp_show_netlink_file() Date: Sat, 12 Aug 2017 14:04:52 +0200 Message-Id: <20170812120510.28750-34-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 Signed-off-by: Phil Sutter --- misc/ss.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index 4d2f75b571ea6..cda5e3b6a2d6f 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -2687,41 +2687,44 @@ static int tcp_show_netlink_file(struct filter *f) { FILE *fp; char buf[16384]; + int err = -1; if ((fp = fopen(getenv("TCPDIAG_FILE"), "r")) == NULL) { perror("fopen($TCPDIAG_FILE)"); - return -1; + return err; } while (1) { - int status, err; + int status, err2; struct nlmsghdr *h = (struct nlmsghdr *)buf; struct sockstat s = {}; status = fread(buf, 1, sizeof(*h), fp); if (status < 0) { perror("Reading header from $TCPDIAG_FILE"); - return -1; + break; } if (status != sizeof(*h)) { perror("Unexpected EOF reading $TCPDIAG_FILE"); - return -1; + break; } status = fread(h+1, 1, NLMSG_ALIGN(h->nlmsg_len-sizeof(*h)), fp); if (status < 0) { perror("Reading $TCPDIAG_FILE"); - return -1; + break; } if (status + sizeof(*h) < h->nlmsg_len) { perror("Unexpected EOF reading $TCPDIAG_FILE"); - return -1; + break; } /* The only legal exit point */ - if (h->nlmsg_type == NLMSG_DONE) - return 0; + if (h->nlmsg_type == NLMSG_DONE) { + err = 0; + break; + } if (h->nlmsg_type == NLMSG_ERROR) { struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(h); @@ -2732,7 +2735,7 @@ static int tcp_show_netlink_file(struct filter *f) errno = -err->error; perror("TCPDIAG answered"); } - return -1; + break; } parse_diag_msg(h, &s); @@ -2741,10 +2744,15 @@ static int tcp_show_netlink_file(struct filter *f) if (f && f->f && run_ssfilter(f->f, &s) == 0) continue; - err = inet_show_sock(h, &s); - if (err < 0) - return err; + err2 = inet_show_sock(h, &s); + if (err2 < 0) { + err = err2; + break; + } } + + fclose(fp); + return err; } static int tcp_show(struct filter *f, int socktype)