36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 9baeea50718fdd55c7ae4d61c15f2a71aef6e050 Mon Sep 17 00:00:00 2001
|
|
From: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Date: Wed, 26 Feb 2020 17:51:53 +0300
|
|
Subject: [PATCH] net: qrtr: Fix error pointer vs NULL bugs
|
|
|
|
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 | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/net/qrtr/ns.c
|
|
+++ b/net/qrtr/ns.c
|
|
@@ -76,7 +76,7 @@ static struct qrtr_node *node_get(unsign
|
|
/* 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(un
|
|
|
|
srv = kzalloc(sizeof(*srv), GFP_KERNEL);
|
|
if (!srv)
|
|
- return ERR_PTR(-ENOMEM);
|
|
+ return NULL;
|
|
|
|
srv->service = service;
|
|
srv->instance = instance;
|