* [PATCH net-next] net: qrtr: Fix error pointer vs NULL bugs
@ 2020-02-26 14:51 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2020-02-26 14:51 UTC (permalink / raw)
To: David S. Miller, Manivannan Sadhasivam
Cc: Jakub Kicinski, netdev, kernel-janitors
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>
---
net/qrtr/ns.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c
index 67a4e59cdf4d..20463cd26e39 100644
--- a/net/qrtr/ns.c
+++ b/net/qrtr/ns.c
@@ -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;
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next] net: qrtr: Fix error pointer vs NULL bugs
@ 2020-02-26 14:51 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2020-02-26 14:51 UTC (permalink / raw)
To: David S. Miller, Manivannan Sadhasivam
Cc: Jakub Kicinski, netdev, kernel-janitors
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>
---
net/qrtr/ns.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c
index 67a4e59cdf4d..20463cd26e39 100644
--- a/net/qrtr/ns.c
+++ b/net/qrtr/ns.c
@@ -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;
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: qrtr: Fix error pointer vs NULL bugs
2020-02-26 14:51 ` Dan Carpenter
@ 2020-02-27 4:52 ` David Miller
-1 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2020-02-27 4:52 UTC (permalink / raw)
To: dan.carpenter; +Cc: manivannan.sadhasivam, kuba, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 26 Feb 2020 17:51:53 +0300
> 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>
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: qrtr: Fix error pointer vs NULL bugs
@ 2020-02-27 4:52 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2020-02-27 4:52 UTC (permalink / raw)
To: dan.carpenter; +Cc: manivannan.sadhasivam, kuba, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 26 Feb 2020 17:51:53 +0300
> 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>
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-27 4:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-26 14:51 [PATCH net-next] net: qrtr: Fix error pointer vs NULL bugs Dan Carpenter
2020-02-26 14:51 ` Dan Carpenter
2020-02-27 4:52 ` David Miller
2020-02-27 4:52 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.