[src/trunk]: src/sys/dev/if_ndis don't leak rl (but there are other leaks), f...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d7f8008b68a4
branches:  trunk
changeset: 337157:d7f8008b68a4
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 04 15:22:02 2015 +0000

description:
don't leak rl (but there are other leaks), found by Brainy.

diffstat:

 sys/dev/if_ndis/if_ndis_pci.c |  19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diffs (71 lines):

diff -r 2022a8e7e189 -r d7f8008b68a4 sys/dev/if_ndis/if_ndis_pci.c
--- a/sys/dev/if_ndis/if_ndis_pci.c     Sat Apr 04 15:16:54 2015 +0000
+++ b/sys/dev/if_ndis/if_ndis_pci.c     Sat Apr 04 15:22:02 2015 +0000
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.20 2014/09/01 19:46:55 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.21 2015/04/04 15:22:02 christos Exp $");
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.8.2.3 2005/03/31 04:24:36 wpaul Exp $");
 #endif
@@ -204,6 +204,7 @@
        int revision, i;
 #endif
        int bar;
+       size_t rllen;
        
        printf("in ndis_attach_pci()\n");
 
@@ -227,9 +228,9 @@
        
        printf("sc->ndis_mtag = %x\n", (unsigned int)sc->ndis_mtag);
 
-       rl = malloc(sizeof(ndis_resource_list) +
-           (sizeof(cm_partial_resource_desc) * (MAX_RESOURCES-1)),
-           M_DEVBUF, M_NOWAIT|M_ZERO);
+       rllen = sizeof(ndis_resource_list) +
+           sizeof(cm_partial_resource_desc) * (MAX_RESOURCES - 1);
+       rl = malloc(rllen, M_DEVBUF, M_NOWAIT|M_ZERO);
 
        if(rl == NULL) {
                sc->error = ENOMEM;
@@ -272,7 +273,7 @@
                                        malloc(sizeof(struct ndis_resource), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) {
                                        //printf("error: out of memory\n");
                                        sc->error = ENOMEM;
-                                       return;
+                                       goto out;
                                }
                                sc->ndis_res_io->res_base = base;
                                sc->ndis_res_io->res_size = size;
@@ -293,7 +294,7 @@
                                        sc->ndis_res_altmem != NULL) {
                                        printf("too many resources\n");
                                        sc->error = ENXIO;
-                                       return;
+                                       goto out;
                                }
                                if(sc->ndis_res_mem) {
                                        if((sc->ndis_res_altmem = 
@@ -317,7 +318,7 @@
                                        if((sc->ndis_res_mem = 
                                                malloc(sizeof(struct ndis_resource), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) {
                                                sc->error = ENOMEM;
-                                               return;
+                                               goto out;
                                        }
                                        sc->ndis_res_mem->res_base = base;
                                        sc->ndis_res_mem->res_size = size;
@@ -364,6 +365,10 @@
        
        kthread_create(PRI_NONE, 0, NULL, ndis_attach, (void *)sc,
            NULL, "ndis_attach");
+       return;
+out:
+       free(rl, M_DEVBUF); 
+       return;
 }