sys/arch/{hppa,hppa64}/dev/apic.c cosmetics, Was:Re: Brainy: User-Triggerable Kernel Memory Leak in execve()

[Alexey Suslikov]

Christian Schulte <cs <at> schulte.it> writes:

> _14/ UNINITIALIZED VARIABLE: sys/arch/hppa64/dev/apic.c rev1.8
>       At l.176, 'cnt' is not initialized.

I came up with the following.

--- sys/arch/hppa/dev/apic.c.orig       Sun Aug  9 14:16:56 2015
+++ sys/arch/hppa/dev/apic.c    Sun Aug  9 14:30:47 2015
@@ -171,12 +171,11 @@
 
        aiv = malloc(sizeof(struct apic_iv), M_DEVBUF, M_NOWAIT);
        if (aiv == NULL) {
-               free(cnt, M_DEVBUF, 0);
-               return NULL;
+               return (NULL);
        }
 
        cnt = malloc(sizeof(struct evcount), M_DEVBUF, M_NOWAIT);
-       if (!cnt) {
+       if (cnt == NULL) {
                free(aiv, M_DEVBUF, 0);
                return (NULL);
        }
--- sys/arch/hppa64/dev/apic.c.orig     Sun Aug  9 14:16:47 2015
+++ sys/arch/hppa64/dev/apic.c  Sun Aug  9 14:31:14 2015
@@ -173,8 +173,7 @@
 
        aiv = malloc(sizeof(struct apic_iv), M_DEVBUF, M_NOWAIT);
        if (aiv == NULL) {
-               free(cnt, M_DEVBUF, 0);
-               return NULL;
+               return (NULL);
        }
 
        aiv->sc = sc;
@@ -185,7 +184,7 @@
        aiv->cnt = NULL;
        if (apic_intr_list[irq]) {
                cnt = malloc(sizeof(struct evcount), M_DEVBUF, M_NOWAIT);
-               if (!cnt) {
+               if (cnt == NULL) {
                        free(aiv, M_DEVBUF, 0);
                        return (NULL);
                }