From owner-svn-src-all@freebsd.org Sun Jan 14 00:46:36 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 56446E644C0 for ; Sun, 14 Jan 2018 00:46:36 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from sonic302-18.consmr.mail.bf2.yahoo.com (sonic302-18.consmr.mail.bf2.yahoo.com [74.6.135.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 108DC80954 for ; Sun, 14 Jan 2018 00:46:35 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1515890788; bh=A7OBMagWLMX748LNqW5cbjh+HzMfIWF7MLlEMTYdJD8=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From:Subject; b=umHdPRI+s6mk3YyFF0xGjQGfwqek36jl4Z+I68DcuwqIPt6s3JaL5BsssZ8nciOgzOk0iEzdpN7lL2S+8Ul+7mVFgWsMspkIbZPqFcbAWH+9K9czKBfsK7wpTdEpj5oab4YjtbSuhc3V+aFbDspV4HHBXAmbmQYUwWygSmT+wSjO6meOkioe8jZPdQQ0OHLPtyUEJtTZJWKaY37XpGWWm273VUxi+PfKERT7OyG3RCGntnnorS+sc/stZoU2qFV3JBpGpqGk1kLvma1HA3qM4nAOgrKpjWp35hzdWWL66FEMHP/AxMns3zsuH9wpn+x2mnEXFZ5xNCPwoiko0vavGQ== X-YMail-OSG: nbclWHkVM1la7Fi0iQhrd6aUnU.tfw2TU5vVmKLcmEf.dpqbm37pO0jhl2XTpU2 _16PjrzCEXdeLStTCyu7CV0vpD943xEYuIXUIhMCR0WeBnQcfzTJB4AuXrWLygapEDTftxvNskWM 77PVqD0g98zaDR5m8oZWgpX0niBp_6ZLlqxV33cMO2.Bm9DDDQUULPj_m2AiWEsgZGpCAdls8r_2 aDlXskxJPVk6jlw_Ud_O_9o4D3gApGdkHvcFn73Em4P2iigYFOmVYWLJ0Nibe1XIR7RdIPp0pSIn LA0ZQm_M5oQzOMOcCNcULlE589VljQh2DfH2K5rKMUeqYCVCnFbSsK3DYN_Gc9tALVBwaeo.sQkt 8Ks5wZiR5eh4yZilQlv94BiEvoueTNYc.RL9EDPQm3nceHguE2M2Pu_VBKz.5rWWWyO_h7.lLwQN UgIaR9Ca45W8V2Ixo11KeMn9oZgfjVbVV3EvoSW8sxN5rn44Y_6NeWs9S_VExGm_zr3HV6t_r Received: from sonic.gate.mail.ne1.yahoo.com by sonic302.consmr.mail.bf2.yahoo.com with HTTP; Sun, 14 Jan 2018 00:46:28 +0000 Received: from smtp107.rhel.mail.bf1.yahoo.com (EHLO [192.168.0.8]) ([98.139.231.44]) by smtp405.mail.bf1.yahoo.com (JAMES SMTP Server ) with ESMTPA ID 759f3adf8607158a085f40da8b3e0b86; Sun, 14 Jan 2018 00:36:21 +0000 (UTC) Subject: Re: svn commit: r327949 - in head/sys/dev: aacraid advansys ath beri/virtio bnxt bwn ciss cxgbe/crypto esp fb gpio if_ndis iwi kbd liquidio liquidio/base mpr mps mpt mrsas mxge netmap nvme pst ral rp s... To: Cy Schubert Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201801140017.w0E0HKS3049183@slippy.cwsent.com> From: Pedro Giffuni Message-ID: Date: Sat, 13 Jan 2018 19:36:21 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <201801140017.w0E0HKS3049183@slippy.cwsent.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US 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: Sun, 14 Jan 2018 00:46:36 -0000 On 01/13/18 19:17, Cy Schubert wrote: > In message <201801132230.w0DMUVmF081985@repo.freebsd.org>, "Pedro F. > Giffuni" w > rites: >> Author: pfg >> Date: Sat Jan 13 22:30:30 2018 >> New Revision: 327949 >> URL: https://svnweb.freebsd.org/changeset/base/327949 >> >> Log: >> dev: make some use of mallocarray(9). >> >> Focus on code where we are doing multiplications within malloc(9). None of >> these is likely to overflow, however the change is still useful as some >> static checkers can benefit from the allocation attributes we use for >> mallocarray. >> >> This initial sweep only covers malloc(9) calls with M_NOWAIT. No good >> reason but I started doing the changes before r327796 and at that time it >> was convenient to make sure the sorrounding code could handle NULL values. >> >> Modified: >> head/sys/dev/aacraid/aacraid.c >> head/sys/dev/advansys/advansys.c >> head/sys/dev/ath/if_ath_rx_edma.c >> head/sys/dev/beri/virtio/virtio.c >> head/sys/dev/bnxt/if_bnxt.c >> head/sys/dev/bwn/if_bwn.c >> head/sys/dev/bwn/if_bwn_phy_lp.c >> head/sys/dev/ciss/ciss.c >> head/sys/dev/cxgbe/crypto/t4_crypto.c >> head/sys/dev/esp/ncr53c9x.c >> head/sys/dev/fb/splash.c >> head/sys/dev/gpio/gpiobus.c >> head/sys/dev/if_ndis/if_ndis.c >> head/sys/dev/iwi/if_iwi.c >> head/sys/dev/kbd/kbd.c >> head/sys/dev/liquidio/base/lio_request_manager.c >> head/sys/dev/liquidio/lio_main.c >> head/sys/dev/mpr/mpr.c >> head/sys/dev/mpr/mpr_mapping.c >> head/sys/dev/mps/mps.c >> head/sys/dev/mps/mps_mapping.c >> head/sys/dev/mpt/mpt_cam.c >> head/sys/dev/mrsas/mrsas.c >> head/sys/dev/mxge/if_mxge.c >> head/sys/dev/netmap/if_ptnet.c >> head/sys/dev/nvme/nvme_ns.c >> head/sys/dev/pst/pst-iop.c >> head/sys/dev/ral/rt2560.c >> head/sys/dev/ral/rt2661.c >> head/sys/dev/rp/rp.c >> head/sys/dev/rp/rp_isa.c >> head/sys/dev/rp/rp_pci.c >> head/sys/dev/sound/midi/midi.c >> head/sys/dev/sound/pci/hda/hdaa.c >> head/sys/dev/syscons/fire/fire_saver.c >> head/sys/dev/virtio/console/virtio_console.c >> head/sys/dev/virtio/mmio/virtio_mmio.c >> head/sys/dev/virtio/network/if_vtnet.c >> head/sys/dev/virtio/pci/virtio_pci.c >> head/sys/dev/vmware/vmxnet3/if_vmx.c >> head/sys/dev/vnic/nicvf_queues.c >> head/sys/dev/xen/blkback/blkback.c >> head/sys/dev/xen/blkfront/blkfront.c >> > >> Modified: head/sys/dev/mxge/if_mxge.c >> ============================================================================= >> = >> --- head/sys/dev/mxge/if_mxge.c Sat Jan 13 21:39:46 2018 (r32794 >> 8) >> +++ head/sys/dev/mxge/if_mxge.c Sat Jan 13 22:30:30 2018 (r32794 >> 9) >> @@ -688,7 +688,7 @@ z_alloc(void *nil, u_int items, u_int size) >> { >> void *ptr; >> >> - ptr = malloc(items * size, M_TEMP, M_NOWAIT); >> + ptr = mallocarray(items, size, M_TEMP, M_NOWAIT); >> return ptr; >> } >> >> @@ -4390,8 +4390,8 @@ mxge_alloc_slices(mxge_softc_t *sc) >> sc->rx_ring_size = cmd.data0; >> max_intr_slots = 2 * (sc->rx_ring_size / sizeof (mcp_dma_addr_t)); >> >> - bytes = sizeof (*sc->ss) * sc->num_slices; > Hi Pedro, > > This broke the build. Very sorry ... should be fixed now (r327949). Thanks! Pedro.