Michael McConville wrote:
> Martin Pieuchot wrote:
> > On 18/09/15(Fri) 11:47, Michael McConville wrote:
> > > Index: arch/arm/xscale/pxa27x_udc.c
> > > ===================================================================
> > > RCS file: /cvs/src/sys/arch/arm/xscale/pxa27x_udc.c,v
> > > retrieving revision 1.31
> > > diff -u -p -r1.31 pxa27x_udc.c
> > > --- arch/arm/xscale/pxa27x_udc.c  15 May 2015 13:32:08 -0000      1.31
> > > +++ arch/arm/xscale/pxa27x_udc.c  18 Sep 2015 15:40:49 -0000
> > > @@ -973,9 +973,7 @@ pxaudc_allocx(struct usbf_bus *bus)
> > >   if (xfer != NULL)
> > >           SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
> > >   else
> > > -         xfer = malloc(sizeof(struct pxaudc_xfer), M_USB, M_NOWAIT);
> > > - if (xfer != NULL)
> > > -         bzero(xfer, sizeof(struct pxaudc_xfer));
> > > +         xfer = malloc(sizeof(struct pxaudc_xfer), M_USB, M_NOWAIT | 
> > > M_ZERO);
> > >   return xfer;
> > >  }
> > 
> > In case you just removed "xfer" from the free list you're loosing the
> > bzero.
> 
> Ah, good catch. Sorry about that.

Does this look better?


Index: arch/arm/xscale/pxa27x_udc.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/xscale/pxa27x_udc.c,v
retrieving revision 1.31
diff -u -p -r1.31 pxa27x_udc.c
--- arch/arm/xscale/pxa27x_udc.c        15 May 2015 13:32:08 -0000      1.31
+++ arch/arm/xscale/pxa27x_udc.c        18 Sep 2015 16:24:55 -0000
@@ -972,10 +972,10 @@ pxaudc_allocx(struct usbf_bus *bus)
        xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
        if (xfer != NULL)
                SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
-       else
-               xfer = malloc(sizeof(struct pxaudc_xfer), M_USB, M_NOWAIT);
-       if (xfer != NULL)
                bzero(xfer, sizeof(struct pxaudc_xfer));
+       else
+               xfer = malloc(sizeof(struct pxaudc_xfer), M_USB,
+                       M_NOWAIT | M_ZERO);
        return xfer;
 }
 
Index: isofs/cd9660/cd9660_vfsops.c
===================================================================
RCS file: /cvs/src/sys/isofs/cd9660/cd9660_vfsops.c,v
retrieving revision 1.71
diff -u -p -r1.71 cd9660_vfsops.c
--- isofs/cd9660/cd9660_vfsops.c        9 Sep 2015 15:59:19 -0000       1.71
+++ isofs/cd9660/cd9660_vfsops.c        18 Sep 2015 16:25:00 -0000
@@ -361,8 +361,7 @@ iso_mountfs(devvp, mp, p, argp)
 
        rootp = (struct iso_directory_record *)pri->root_directory_record;
 
-       isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_WAITOK);
-       bzero((caddr_t)isomp, sizeof *isomp);
+       isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_WAITOK | M_ZERO);
        isomp->logical_block_size = logical_block_size;
        isomp->volume_space_size = isonum_733 (pri->volume_space_size);
        bcopy (rootp, isomp->root, sizeof isomp->root);
Index: kern/sys_process.c
===================================================================
RCS file: /cvs/src/sys/kern/sys_process.c,v
retrieving revision 1.67
diff -u -p -r1.67 sys_process.c
--- kern/sys_process.c  20 Jan 2015 19:43:21 -0000      1.67
+++ kern/sys_process.c  18 Sep 2015 16:25:00 -0000
@@ -346,10 +346,10 @@ sys_ptrace(struct proc *p, void *v, regi
                /* Just set the trace flag. */
                atomic_setbits_int(&tr->ps_flags, PS_TRACED);
                tr->ps_oppid = tr->ps_pptr->ps_pid;
-               if (tr->ps_ptstat == NULL)
+               if (tr->ps_ptstat == NULL) {
                        tr->ps_ptstat = malloc(sizeof(*tr->ps_ptstat),
-                           M_SUBPROC, M_WAITOK);
-               memset(tr->ps_ptstat, 0, sizeof(*tr->ps_ptstat));
+                           M_SUBPROC, M_WAITOK | M_ZERO);
+               }
                return (0);
 
        case  PT_WRITE_I:               /* XXX no separate I and D spaces */

Reply via email to