• Dave Jones's avatar
    slab: fix wrong retval on kmem_cache_create_memcg error path · ba3253c7
    Dave Jones authored
    On kmem_cache_create_memcg() error path we set 'err', but leave 's' (the
    new cache ptr) undefined.  The latter can be NULL if we could not
    allocate the cache, or pointing to a freed area if we failed somewhere
    later while trying to initialize it.  Initially we checked 'err'
    immediately before exiting the function and returned NULL if it was set
    ignoring the value of 's':
    
        out_unlock:
            ...
            if (err) {
                /* report error */
                return NULL;
            }
            return s;
    
    Recently this check was, in fact, broken by commit f717eb3a ("slab:
    do not panic if we fail to create memcg cache"), which turned it to:
    
        out_unlock:
            ...
            if (err && !memcg) {
                /* report error */
                return NULL;
            }
            return s;
    
    As a result, if we are failing creating a cache for a memcg, we will
    skip the check and return 's' that can contain crap.  Obviously, commit
    f717eb3a intended not to return crap on error allocating a cache for
    a memcg, but only to remove the error reporting in this case, so the
    check should look like this:
    
        out_unlock:
            ...
            if (err) {
                if (!memcg)
                    return NULL;
                /* report error */
                return NULL;
            }
            return s;
    
    [rientjes@google.com: despaghettification]
    [vdavydov@parallels.com: patch monkeying]
    Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
    Signed-off-by: default avatarVladimir Davydov <vdavydov@parallels.com>
    Signed-off-by: default avatarDave Jones <davej@redhat.com>
    Reported-by: default avatarDave Jones <davej@redhat.com>
    Acked-by: default avatarPekka Enberg <penberg@kernel.org>
    Cc: Christoph Lameter <cl@linux.com>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    ba3253c7
slab_common.c 16.2 KB