]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
net: qrtr: Fix error pointer vs NULL bugs
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 26 Feb 2020 14:51:53 +0000 (17:51 +0300)
committerDavid S. Miller <davem@davemloft.net>
Thu, 27 Feb 2020 04:52:31 +0000 (20:52 -0800)
The callers only expect NULL pointers, so returning an error pointer
will lead to an Oops.

Fixes: 0c2204a4ad71 ("net: qrtr: Migrate nameservice to kernel from userspace")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/qrtr/ns.c

index 7bfde01f4e8afc344a46d837f5a425ed457579fe..413228c4520e937ad69d533cb3cb47eea0e1e39e 100644 (file)
@@ -76,7 +76,7 @@ static struct qrtr_node *node_get(unsigned int node_id)
        /* If node didn't exist, allocate and insert it to the tree */
        node = kzalloc(sizeof(*node), GFP_KERNEL);
        if (!node)
-               return ERR_PTR(-ENOMEM);
+               return NULL;
 
        node->id = node_id;
 
@@ -224,7 +224,7 @@ static struct qrtr_server *server_add(unsigned int service,
 
        srv = kzalloc(sizeof(*srv), GFP_KERNEL);
        if (!srv)
-               return ERR_PTR(-ENOMEM);
+               return NULL;
 
        srv->service = service;
        srv->instance = instance;