diff --git a/[refs] b/[refs] index 0ea85dc437d7..f00f4d9c31db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea3fb371b2a391958670f2a65e1203f7dba61671 +refs/heads/master: 72150e9b7fec217fbd646a29ea2f65a3d4d55ea9 diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 61a65a2e0455..c5812bbc2cc9 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -2288,7 +2288,8 @@ int proto_register(struct proto *prot, int alloc_slab) prot->rsk_prot->slab = NULL; } out_free_request_sock_slab_name: - kfree(prot->rsk_prot->slab_name); + if (prot->rsk_prot) + kfree(prot->rsk_prot->slab_name); out_free_sock_slab: kmem_cache_destroy(prot->slab); prot->slab = NULL;