From owner-svn-src-all@freebsd.org Wed Jan 10 20:05:21 2018 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 1766EE73A4F; Wed, 10 Jan 2018 20:05:21 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E789869298; Wed, 10 Jan 2018 20:05:20 +0000 (UTC) (envelope-from pfg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3BDC5246C; Wed, 10 Jan 2018 20:05:20 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0AK5Kcm091358; Wed, 10 Jan 2018 20:05:20 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0AK5JRv091356; Wed, 10 Jan 2018 20:05:19 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201801102005.w0AK5JRv091356@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Wed, 10 Jan 2018 20:05:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327782 - head/sys/dev/bxe X-SVN-Group: head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: head/sys/dev/bxe X-SVN-Commit-Revision: 327782 X-SVN-Commit-Repository: base 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.25 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, 10 Jan 2018 20:05:21 -0000 Author: pfg Date: Wed Jan 10 20:05:19 2018 New Revision: 327782 URL: https://svnweb.freebsd.org/changeset/base/327782 Log: dev/bxe: make use of mallocarray(9). Use mallocarray in a couple of cases where a calloc-like operation is taking place. Modified: head/sys/dev/bxe/bxe.c head/sys/dev/bxe/ecore_sp.h Modified: head/sys/dev/bxe/bxe.c ============================================================================== --- head/sys/dev/bxe/bxe.c Wed Jan 10 19:45:38 2018 (r327781) +++ head/sys/dev/bxe/bxe.c Wed Jan 10 20:05:19 2018 (r327782) @@ -12018,7 +12018,8 @@ bxe_set_mc_list(struct bxe_softc *sc) } bzero(mta, (sizeof(unsigned char) * ETHER_ADDR_LEN * mc_count)); - mc_mac = malloc(sizeof(*mc_mac) * mc_count, M_DEVBUF, (M_NOWAIT | M_ZERO)); + mc_mac = mallocarray(mc_count, sizeof(*mc_mac), M_DEVBUF, + (M_NOWAIT | M_ZERO)); mc_mac_start = mc_mac; if (!mc_mac) { Modified: head/sys/dev/bxe/ecore_sp.h ============================================================================== --- head/sys/dev/bxe/ecore_sp.h Wed Jan 10 19:45:38 2018 (r327781) +++ head/sys/dev/bxe/ecore_sp.h Wed Jan 10 20:05:19 2018 (r327782) @@ -159,7 +159,7 @@ typedef struct mtx ECORE_MUTEX_SPIN; malloc(_size, M_TEMP, (M_NOWAIT | M_ZERO)) #define ECORE_CALLOC(_len, _size, _flags, _sc) \ - malloc(_len * _size, M_TEMP, (M_NOWAIT | M_ZERO)) + mallocarray(_len, _size, M_TEMP, (M_NOWAIT | M_ZERO)) #define ECORE_FREE(_s, _buf, _size) free(_buf, M_TEMP)