From owner-svn-src-all@FreeBSD.ORG Mon Jun 22 05:36:09 2015 Return-Path: Delivered-To: svn-src-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37302EBA; Mon, 22 Jun 2015 05:36:09 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B2D5BCB; Mon, 22 Jun 2015 05:36:09 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5M5a83E032998; Mon, 22 Jun 2015 05:36:08 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5M5a8cF032997; Mon, 22 Jun 2015 05:36:08 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201506220536.t5M5a8cF032997@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Mon, 22 Jun 2015 05:36:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r284694 - stable/10/usr.bin/sockstat X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 05:36:09 -0000 Author: tuexen Date: Mon Jun 22 05:36:08 2015 New Revision: 284694 URL: https://svnweb.freebsd.org/changeset/base/284694 Log: MFC r284604: Don't leak sockets. Reported by: Coverity CID: 1306785 Modified: stable/10/usr.bin/sockstat/sockstat.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/sockstat/sockstat.c ============================================================================== --- stable/10/usr.bin/sockstat/sockstat.c Mon Jun 22 05:34:13 2015 (r284693) +++ stable/10/usr.bin/sockstat/sockstat.c Mon Jun 22 05:36:08 2015 (r284694) @@ -255,6 +255,26 @@ sockaddr(struct sockaddr_storage *sa, in } static void +free_socket(struct sock *sock) +{ + struct addr *cur, *next; + + cur = sock->laddr; + while (cur != NULL) { + next = cur->next; + free(cur); + cur = next; + } + cur = sock->faddr; + while (cur != NULL) { + next = cur->next; + free(cur); + cur = next; + } + free(sock); +} + +static void gather_sctp(void) { struct sock *sock; @@ -366,14 +386,17 @@ gather_sctp(void) while (offset < len) { xstcb = (struct xsctp_tcb *)(void *)(buf + offset); offset += sizeof(struct xsctp_tcb); - if (no_stcb && - opt_l && - (!opt_L || !local_all_loopback) && - ((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) || - (xstcb->last == 1))) { - hash = (int)((uintptr_t)sock->socket % HASHSIZE); - sock->next = sockhash[hash]; - sockhash[hash] = sock; + if (no_stcb) { + if (opt_l && + (!opt_L || !local_all_loopback) && + ((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) || + (xstcb->last == 1))) { + hash = (int)((uintptr_t)sock->socket % HASHSIZE); + sock->next = sockhash[hash]; + sockhash[hash] = sock; + } else { + free_socket(sock); + } } if (xstcb->last == 1) break; @@ -476,11 +499,14 @@ gather_sctp(void) prev_faddr->next = faddr; prev_faddr = faddr; } - if (opt_c && - (!opt_L || !(local_all_loopback || foreign_all_loopback))) { - hash = (int)((uintptr_t)sock->socket % HASHSIZE); - sock->next = sockhash[hash]; - sockhash[hash] = sock; + if (opt_c) { + if (!opt_L || !(local_all_loopback || foreign_all_loopback)) { + hash = (int)((uintptr_t)sock->socket % HASHSIZE); + sock->next = sockhash[hash]; + sockhash[hash] = sock; + } else { + free_socket(sock); + } } } xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset);