From owner-svn-src-user@freebsd.org Wed Feb 3 02:00:21 2016 Return-Path: Delivered-To: svn-src-user@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 7D143A9A059 for ; Wed, 3 Feb 2016 02:00:21 +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 4F0C7B22; Wed, 3 Feb 2016 02:00:21 +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 u1320KRH051934; Wed, 3 Feb 2016 02:00:20 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1320KMh051933; Wed, 3 Feb 2016 02:00:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201602030200.u1320KMh051933@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 3 Feb 2016 02:00:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r295188 - user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Feb 2016 02:00:21 -0000 Author: ngie Date: Wed Feb 3 02:00:20 2016 New Revision: 295188 URL: https://svnweb.freebsd.org/changeset/base/295188 Log: Use destination buffer instead of source buffer size to mute valid security concerns with strlcpy related to their respective buffer sizes (-Wstrlcpy-strlcat-size) Reported by: Jenkins (clang job) Sponsored by: EMC / Isilon Storage Division Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c ============================================================================== --- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Wed Feb 3 01:58:37 2016 (r295187) +++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Wed Feb 3 02:00:20 2016 (r295188) @@ -283,7 +283,7 @@ enum_pair_insert(struct enum_pairs *head } e_new->enum_val = enum_val; - strlcpy(e_new->enum_str, enum_str, strlen(enum_str) + 1); + strlcpy(e_new->enum_str, enum_str, strlen(e_new->enum_str)); STAILQ_INSERT_TAIL(headp, e_new, link); return (1); @@ -569,7 +569,7 @@ snmp_enumtc_init(char *name) free(enum_tc); return (NULL); } - strlcpy(enum_tc->name, name, strlen(name) + 1); + strlcpy(enum_tc->name, name, sizeof(enum_tc->name)); return (enum_tc); }