From owner-svn-src-head@freebsd.org Tue Jan 16 06:26:56 2018 Return-Path: Delivered-To: svn-src-head@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 BD168E7BBF3 for ; Tue, 16 Jan 2018 06:26:56 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from sonic309-36.consmr.mail.ne1.yahoo.com (sonic309-36.consmr.mail.ne1.yahoo.com [66.163.184.162]) (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 90BFC68994 for ; Tue, 16 Jan 2018 06:26:56 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1516084015; bh=FQaW4aAjrUqX2Rj4LgAplJV0eNUIdQNvE9JE1hoiPY4=; h=Subject:To:References:From:Date:In-Reply-To:From:Subject; b=rKDp11TSUV4jCZteVTFjMZw8CNG6Mz2KdF6iv89mZBDjTSJwqQYSM8nu6wjd7YtgzhMm9OIwAHzMbM3ODXU6jt/3VZgQrXRQedbspYol9yjHbCRadymkTDT4nWCp3oHE8gJLxCi0qFuW8QrlLbVBYl299ePLG3VBn6pjAuQTNy1bFO50WjGIv3TCSVqjqURSIpHskxj1jgCItZ9v+6XG2HQdYb/B00Hp7maHNVDDjXLEmMtVSKZY5enq/ID3TS1yYVFwg1HAl6TJS3zitMrMTQ7L1+qdWiq+8FuUio2d5QPZHahvT2SeT/Fg5XaTlb2KLm0xEWT9HwtnSTVZ8g8y1Q== X-YMail-OSG: W6Paa_AVM1kD.KKWAiOf6q4TT.g02BQXQ9TeS4O2xwtjKXKbar8iXEZc4nPHpgr BMt6at.xXy0R0CFD5GD4BnkNUCKZGFYb2NhCu2binJncHQkYoiNHAEJFlWT_lcoNn3F2IX.FkAeh 305NXxxmNPuskRYV0xSo_TQuoVF7KqZKjU.1PkvFefGxUyciEJTYHv.SPSwttpEim4Tq0j7VojXk v.Bi9113Zi2ucWAnzkGCcY._UXckpeoyxrMVoySwvZm_38e.OniyFP3sY5S09jHl_oSfoSFGJ_Xh MQ3DU3Vr9mPnTV_VGOAqgsVRpDliXfExp0ASPabZ98U_m2eClf76Kn35iaUUOnuHOh6Io6Vypsun 9_m.aTyUXf7piJrQtgRV7oe00l9mzv9ftOn6HDjLVIxBZw.M0Gl2lGMmoDHbAqtD3Cxn55oRHmbn akBQLTXW9Q8O8GAI32f1XiiTRKoEvrZP.T3VgVSvcouypLBkUJaH30a75QbB_XNTE40BNDsvi Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.ne1.yahoo.com with HTTP; Tue, 16 Jan 2018 06:26:55 +0000 Received: from smtp234.mail.ne1.yahoo.com (EHLO [192.168.0.8]) ([10.218.253.207]) by smtp404.mail.ne1.yahoo.com (JAMES SMTP Server ) with ESMTPA ID 88bc775ad51267311c75ec27191e6efd; Tue, 16 Jan 2018 06:06:40 +0000 (UTC) Subject: Re: svn commit: r328020 - in head/sys/mips: mips nlm/dev/sec To: Ravi Pokala , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201801152113.w0FLDUUn065783@repo.freebsd.org> <560DA44B-159E-431D-B388-4E5E8962E1CD@mac.com> From: Pedro Giffuni Message-ID: <945535f7-119f-1da4-c64c-f7a7e99e467a@FreeBSD.org> Date: Tue, 16 Jan 2018 01:06:39 -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: <560DA44B-159E-431D-B388-4E5E8962E1CD@mac.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jan 2018 06:26:56 -0000 Thanks for the report; On 01/16/18 00:23, Ravi Pokala wrote: > Hi Pedro, > > This change breaks many (most? all?) MIPS kernels (universe, no special config, -DNO_CLEAN): Ugh, yes .. the build was broken by another change so I didn't notice  this in my builds. Sorry .. should be fixed as r328041. Pedro. > --- busdma_machdep.o --- > cc1: warnings being treated as errors > /usr/home/rpokala/freebsd/clean/base/head/sys/mips/mips/busdma_machdep.c: In function 'bus_dmamap_create': > /usr/home/rpokala/freebsd/clean/base/head/sys/mips/mips/busdma_machdep.c:539: warning: passing argument 2 of 'malloc' makes pointer from integer without a cast > /usr/home/rpokala/freebsd/clean/base/head/sys/mips/mips/busdma_machdep.c:539: warning: passing argument 3 of 'malloc' makes integer from pointer without a cast > /usr/home/rpokala/freebsd/clean/base/head/sys/mips/mips/busdma_machdep.c:539: error: too many arguments to function 'malloc' > /usr/home/rpokala/freebsd/clean/base/head/sys/mips/mips/busdma_machdep.c: In function 'bus_dmamem_alloc': > /usr/home/rpokala/freebsd/clean/base/head/sys/mips/mips/busdma_machdep.c:651: warning: passing argument 2 of 'malloc' makes pointer from integer without a cast > /usr/home/rpokala/freebsd/clean/base/head/sys/mips/mips/busdma_machdep.c:651: warning: passing argument 3 of 'malloc' makes integer from pointer without a cast > /usr/home/rpokala/freebsd/clean/base/head/sys/mips/mips/busdma_machdep.c:651: error: too many arguments to function 'malloc' > > Thanks, > > Ravi (rpokala@) > > > -----Original Message----- > From: on behalf of "Pedro F. Giffuni" > Date: 2018-01-15, Monday at 13:13 > To: , , > Subject: svn commit: r328020 - in head/sys/mips: mips nlm/dev/sec > > Author: pfg > Date: Mon Jan 15 21:13:30 2018 > New Revision: 328020 > URL: https://svnweb.freebsd.org/changeset/base/328020 > > Log: > mips: make some use of mallocarray(9). > > Focus on code where we are doing multiplications within malloc(9). None of > these ire 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. > > X-Differential revision: https://reviews.freebsd.org/D13837 > > Modified: > head/sys/mips/mips/busdma_machdep.c > head/sys/mips/nlm/dev/sec/nlmrsa.c > > Modified: head/sys/mips/mips/busdma_machdep.c > ============================================================================== > --- head/sys/mips/mips/busdma_machdep.c Mon Jan 15 21:11:38 2018 (r328019) > +++ head/sys/mips/mips/busdma_machdep.c Mon Jan 15 21:13:30 2018 (r328020) > @@ -345,7 +345,8 @@ _busdma_alloc_dmamap(bus_dma_tag_t dmat) > struct sync_list *slist; > bus_dmamap_t map; > > - slist = malloc(sizeof(*slist) * dmat->nsegments, M_BUSDMA, M_NOWAIT); > + slist = mallocarray(dmat->nsegments, sizeof(*slist), M_BUSDMA, > + M_NOWAIT); > if (slist == NULL) > return (NULL); > map = uma_zalloc_arg(dmamap_zone, dmat, M_NOWAIT); > @@ -534,9 +535,8 @@ bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_d > int error = 0; > > if (dmat->segments == NULL) { > - dmat->segments = (bus_dma_segment_t *)malloc( > - sizeof(bus_dma_segment_t) * dmat->nsegments, M_BUSDMA, > - M_NOWAIT); > + dmat->segments = (bus_dma_segment_t *)malloc(dmat->nsegments, > + sizeof(bus_dma_segment_t), M_BUSDMA, M_NOWAIT); > if (dmat->segments == NULL) { > CTR3(KTR_BUSDMA, "%s: tag %p error %d", > __func__, dmat, ENOMEM); > @@ -647,9 +647,8 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddrp, in > else > mflags = M_WAITOK; > if (dmat->segments == NULL) { > - dmat->segments = (bus_dma_segment_t *)malloc( > - sizeof(bus_dma_segment_t) * dmat->nsegments, M_BUSDMA, > - mflags); > + dmat->segments = (bus_dma_segment_t *)malloc(dmat->nsegments, > + sizeof(bus_dma_segment_t), M_BUSDMA, mflags); > if (dmat->segments == NULL) { > CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", > __func__, dmat, dmat->flags, ENOMEM); > > Modified: head/sys/mips/nlm/dev/sec/nlmrsa.c > ============================================================================== > --- head/sys/mips/nlm/dev/sec/nlmrsa.c Mon Jan 15 21:11:38 2018 (r328019) > +++ head/sys/mips/nlm/dev/sec/nlmrsa.c Mon Jan 15 21:13:30 2018 (r328020) > @@ -346,7 +346,7 @@ xlp_rsa_newsession(device_t dev, u_int32_t *sidp, stru > > if (ses == NULL) { > sesn = sc->sc_nsessions; > - ses = malloc((sesn + 1) * sizeof(*ses), > + ses = mallocarray(sesn + 1, sizeof(*ses), > M_DEVBUF, M_NOWAIT); > if (ses == NULL) > return (ENOMEM); > @@ -528,8 +528,9 @@ xlp_rsa_kprocess(device_t dev, struct cryptkop *krp, i > goto errout; > } > cmd->rsafn = 0; /* Mod Exp */ > - cmd->rsasrc = malloc( > - cmd->rsaopsize * (krp->krp_iparams + krp->krp_oparams), > + cmd->rsasrc = mallocarray( > + krp->krp_iparams + krp->krp_oparams, > + cmd->rsaopsize, > M_DEVBUF, > M_NOWAIT | M_ZERO); > if (cmd->rsasrc == NULL) { > > > >