From: Andrii Nakryiko <and...@kernel.org>

Return -ENOMEM instead of NULL, which makes caller's error handling just
a touch simpler.

Signed-off-by: Andrii Nakryiko <and...@kernel.org>
Signed-off-by: Oleg Nesterov <o...@redhat.com>
---
 kernel/events/uprobes.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 4950decebe5c..e5b7c6239970 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -725,7 +725,7 @@ static struct uprobe *alloc_uprobe(struct inode *inode, 
loff_t offset,
 
        uprobe = kzalloc(sizeof(struct uprobe), GFP_KERNEL);
        if (!uprobe)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        uprobe->inode = inode;
        uprobe->offset = offset;
@@ -1166,8 +1166,6 @@ int uprobe_register(struct inode *inode, loff_t offset, 
loff_t ref_ctr_offset,
 
  retry:
        uprobe = alloc_uprobe(inode, offset, ref_ctr_offset);
-       if (!uprobe)
-               return -ENOMEM;
        if (IS_ERR(uprobe))
                return PTR_ERR(uprobe);
 
-- 
2.25.1.362.g51ebf55



Reply via email to