From: Oleg Nesterov <oleg@redhat.com>
To: andrii@kernel.org, mhiramat@kernel.org, peterz@infradead.org
Cc: jolsa@kernel.org, rostedt@goodmis.org,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Subject: [PATCH v2 3/5] uprobes: simplify error handling for alloc_uprobe()
Date: Mon, 29 Jul 2024 15:45:25 +0200 [thread overview]
Message-ID: <20240729134525.GA12315@redhat.com> (raw)
In-Reply-To: <20240729134444.GA12293@redhat.com>
From: Andrii Nakryiko <andrii@kernel.org>
Return -ENOMEM instead of NULL, which makes caller's error handling just
a touch simpler.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Oleg Nesterov <oleg@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 eb71428691bb..dfe6306a63b1 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;
@@ -1167,8 +1167,6 @@ static int __uprobe_register(struct inode *inode, loff_t 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
next prev parent reply other threads:[~2024-07-29 13:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-29 13:44 [PATCH v2 0/5] uprobes: misc cleanups/simplifications Oleg Nesterov
2024-07-29 13:45 ` [PATCH v2 1/5] uprobes: document the usage of mm->mmap_lock Oleg Nesterov
2024-07-29 13:45 ` [PATCH v2 2/5] uprobes: is_trap_at_addr: don't use get_user_pages_remote() Oleg Nesterov
2024-07-29 13:45 ` Oleg Nesterov [this message]
2024-07-29 13:45 ` [PATCH v2 4/5] uprobes: kill uprobe_register_refctr() Oleg Nesterov
2024-07-31 5:37 ` Masami Hiramatsu
2024-07-31 7:56 ` Oleg Nesterov
2024-07-31 8:10 ` [PATCH v3 " Oleg Nesterov
2024-07-29 13:45 ` [PATCH v2 5/5] uprobes: make uprobe_register() return struct uprobe * Oleg Nesterov
2024-07-31 5:39 ` Masami Hiramatsu
2024-07-31 7:44 ` Oleg Nesterov
2024-07-31 16:18 ` Andrii Nakryiko
2024-07-31 16:56 ` Peter Zijlstra
2024-07-31 17:01 ` Andrii Nakryiko
2024-07-31 17:05 ` Peter Zijlstra
2024-07-31 17:12 ` Andrii Nakryiko
2024-07-31 17:24 ` Oleg Nesterov
2024-07-31 17:17 ` Oleg Nesterov
2024-08-01 13:10 ` Peter Zijlstra
2024-08-01 11:32 ` Jiri Olsa
2024-08-01 12:00 ` Oleg Nesterov
2024-08-01 12:15 ` Jiri Olsa
2024-08-01 12:26 ` Oleg Nesterov
2024-08-01 13:07 ` Jiri Olsa
2024-07-30 7:42 ` [PATCH v2 0/5] uprobes: misc cleanups/simplifications Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240729134525.GA12315@redhat.com \
--to=oleg@redhat.com \
--cc=andrii@kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).