From owner-svn-src-all@freebsd.org Wed Jan 4 02:46:37 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 676E4C9DF26; Wed, 4 Jan 2017 02:46:37 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 37353176A; Wed, 4 Jan 2017 02:46:37 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v042kao8039042; Wed, 4 Jan 2017 02:46:36 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v042kaEh039041; Wed, 4 Jan 2017 02:46:36 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201701040246.v042kaEh039041@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 4 Jan 2017 02:46:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r311233 - head/contrib/netbsd-tests/fs/tmpfs X-SVN-Group: head 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.23 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: Wed, 04 Jan 2017 02:46:37 -0000 Author: ngie Date: Wed Jan 4 02:46:36 2017 New Revision: 311233 URL: https://svnweb.freebsd.org/changeset/base/311233 Log: Fix Coverity issues - Initialize .sun_len before passing it to strlcpy and bind. - Close fd on error MFC after: 3 days Reported by: Coverity CID: 978283, 979581 Modified: head/contrib/netbsd-tests/fs/tmpfs/h_tools.c Modified: head/contrib/netbsd-tests/fs/tmpfs/h_tools.c ============================================================================== --- head/contrib/netbsd-tests/fs/tmpfs/h_tools.c Wed Jan 4 02:43:33 2017 (r311232) +++ head/contrib/netbsd-tests/fs/tmpfs/h_tools.c Wed Jan 4 02:46:36 2017 (r311233) @@ -243,12 +243,19 @@ sockets_main(int argc, char **argv) return EXIT_FAILURE; } +#ifdef __FreeBSD__ + addr.sun_len = sizeof(addr.sun_path); + (void)strlcpy(addr.sun_path, argv[1], addr.sun_len); +#else (void)strlcpy(addr.sun_path, argv[1], sizeof(addr.sun_path)); +#endif addr.sun_family = PF_UNIX; - error = bind(fd, (struct sockaddr *)&addr, sizeof(addr)); if (error == -1) { warn("connect"); +#ifdef __FreeBSD__ + (void)close(fd); +#endif return EXIT_FAILURE; }