Index: subr_autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/kern/subr_autoconf.c,v
retrieving revision 1.239
diff -p -u -r1.239 subr_autoconf.c
--- subr_autoconf.c     28 Jan 2016 16:32:40 -0000      1.239
+++ subr_autoconf.c     13 Mar 2016 09:57:50 -0000
@@ -2649,6 +2649,8 @@ device_active_register(device_t dev, voi
       old_handlers = dev->dv_activity_handlers;
       old_size = dev->dv_activity_count;

+       KASSERT(old_size == 0 || old_handlers != NULL);
+
       for (i = 0; i < old_size; ++i) {
               KASSERT(old_handlers[i] != handler);
               if (old_handlers[i] == NULL) {
@@ -2660,17 +2662,18 @@ device_active_register(device_t dev, voi
       new_size = old_size + 4;
       new_handlers = kmem_alloc(sizeof(void *[new_size]), KM_SLEEP);

-       memcpy(new_handlers, old_handlers, sizeof(void *[old_size]));
+       for (i = 0; i < old_size; ++i)
+               new_handlers[i] = old_handlers[i];
       new_handlers[old_size] = handler;
-       memset(new_handlers + old_size + 1, 0,
-           sizeof(int [new_size - (old_size+1)]));
+       for (i = old_size+1; i < new_size; ++i)
+               new_handlers[i] = NULL;

       s = splhigh();
       dev->dv_activity_count = new_size;
       dev->dv_activity_handlers = new_handlers;
       splx(s);

-       if (old_handlers != NULL)
+       if (old_size > 0)
               kmem_free(old_handlers, sizeof(void * [old_size]));

       return true;

You are viewing proxied material from ftp.icm.edu.pl. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.