From owner-p4-projects@FreeBSD.ORG Mon Aug 11 19:45:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 824AE1065675; Mon, 11 Aug 2008 19:45:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45786106566C for ; Mon, 11 Aug 2008 19:45:00 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 333588FC18 for ; Mon, 11 Aug 2008 19:45:00 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BJj067065084 for ; Mon, 11 Aug 2008 19:45:00 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BJj0vC065080 for perforce@freebsd.org; Mon, 11 Aug 2008 19:45:00 GMT (envelope-from sson@FreeBSD.org) Date: Mon, 11 Aug 2008 19:45:00 GMT Message-Id: <200808111945.m7BJj0vC065080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 147173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 19:45:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=147173 Change 147173 by sson@sson_amd64 on 2008/08/11 19:44:59 strcpy() -> strncpy() to appease static checkers. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#20 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#15 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#15 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#13 $ */ #include @@ -71,14 +71,14 @@ if (strlen(classname) >= AU_CLASS_NAME_MAX) return (NULL); - strcpy(c->ac_name, classname); + strncpy(c->ac_name, classname, AU_CLASS_NAME_MAX); /* * Check for very large class description. */ if (strlen(classdesc) >= AU_CLASS_DESC_MAX) return (NULL); - strcpy(c->ac_desc, classdesc); + strncpy(c->ac_desc, classdesc, AU_CLASS_DESC_MAX); c->ac_class = strtoul(classflag, (char **) NULL, 0); return (c); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#20 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#20 $ */ #include @@ -368,7 +368,7 @@ pthread_mutex_unlock(&mutex); return (-3); } - strcpy(name, dir); + strncpy(name, dir, len); pthread_mutex_unlock(&mutex); return (ret); } @@ -458,7 +458,7 @@ pthread_mutex_unlock(&mutex); return (-3); } - strcpy(auditstr, str); + strncpy(auditstr, str, len); pthread_mutex_unlock(&mutex); return (0); } @@ -485,7 +485,7 @@ pthread_mutex_unlock(&mutex); return (-3); } - strcpy(auditstr, str); + strncpy(auditstr, str, len); pthread_mutex_unlock(&mutex); return (0); } @@ -512,7 +512,7 @@ pthread_mutex_unlock(&mutex); return (-3); } - strcpy(auditstr, str); + strncpy(auditstr, str, len); pthread_mutex_unlock(&mutex); return (0); } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#15 $ */ #include @@ -68,13 +68,13 @@ if (strlen(evname) >= AU_EVENT_NAME_MAX) return (NULL); - strcpy(e->ae_name, evname); + strncpy(e->ae_name, evname, AU_EVENT_NAME_MAX); if (evdesc != NULL) { if (strlen(evdesc) >= AU_EVENT_DESC_MAX) return (NULL); - strcpy(e->ae_desc, evdesc); + strncpy(e->ae_desc, evdesc, AU_EVENT_DESC_MAX); } else - strcpy(e->ae_desc, ""); + strncpy(e->ae_desc, "", AU_EVENT_DESC_MAX); e->ae_number = atoi(evno); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#15 $ */ #include @@ -157,10 +157,10 @@ if (sel != 0) { if (verbose) { - strcpy(strptr, c.ac_desc); + strncpy(strptr, c.ac_desc, AU_CLASS_DESC_MAX); strptr += strlen(c.ac_desc); } else { - strcpy(strptr, c.ac_name); + strncpy(strptr, c.ac_name, AU_CLASS_NAME_MAX); strptr += strlen(c.ac_name); } *strptr = ','; /* delimiter */ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#17 $ */ #include @@ -66,7 +66,7 @@ if (strlen(username) >= AU_USER_NAME_MAX) return (NULL); - strcpy(u->au_name, username); + strncpy(u->au_name, username, AU_USER_NAME_MAX); if (getauditflagsbin(always, &(u->au_always)) == -1) return (NULL);