From: Dmitry Kadashev <[email protected]>
To: Jens Axboe <[email protected]>,
Alexander Viro <[email protected]>,
Christian Brauner <[email protected]>,
Linus Torvalds <[email protected]>
Cc: Pavel Begunkov <[email protected]>,
[email protected], [email protected],
Dmitry Kadashev <[email protected]>
Subject: [PATCH v9 01/11] namei: ignore ERR/NULL names in putname()
Date: Thu, 8 Jul 2021 13:34:37 +0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
Supporting ERR/NULL names in putname() makes callers code cleaner, and
is what some other path walking functions already support for the same
reason.
This also removes a few existing IS_ERR checks before putname().
Suggested-by: Linus Torvalds <[email protected]>
Link: https://lore.kernel.org/io-uring/CAHk-=wgCac9hBsYzKMpHk0EbLgQaXR=OUAjHaBtaY+G8A9KhFg@mail.gmail.com/
Cc: Linus Torvalds <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Christian Brauner <[email protected]>
Signed-off-by: Dmitry Kadashev <[email protected]>
---
fs/namei.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 79b0ff9b151e..70caf4ef1134 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -247,6 +247,9 @@ getname_kernel(const char * filename)
void putname(struct filename *name)
{
+ if (IS_ERR_OR_NULL(name))
+ return;
+
BUG_ON(name->refcnt <= 0);
if (--name->refcnt > 0)
@@ -4718,11 +4721,9 @@ int do_renameat2(int olddfd, struct filename *from, int newdfd,
goto retry;
}
put_both:
- if (!IS_ERR(from))
- putname(from);
+ putname(from);
put_new:
- if (!IS_ERR(to))
- putname(to);
+ putname(to);
return error;
}
--
2.30.2
next prev parent reply other threads:[~2021-07-08 6:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 6:34 [PATCH v9 00/11] io_uring: add mkdir and [sym]linkat support Dmitry Kadashev
2021-07-08 6:34 ` Dmitry Kadashev [this message]
2021-07-08 6:34 ` [PATCH v9 02/11] namei: change filename_parentat() calling conventions Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 03/11] namei: make do_mkdirat() take struct filename Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 04/11] namei: make do_mknodat() " Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 05/11] namei: make do_symlinkat() " Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 06/11] namei: add getname_uflags() Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 07/11] namei: make do_linkat() take struct filename Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 08/11] namei: update do_*() helpers to return ints Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 09/11] io_uring: add support for IORING_OP_MKDIRAT Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 10/11] io_uring: add support for IORING_OP_SYMLINKAT Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 11/11] io_uring: add support for IORING_OP_LINKAT Dmitry Kadashev
2021-07-08 18:34 ` [PATCH v9 00/11] io_uring: add mkdir and [sym]linkat support Linus Torvalds
2021-07-08 19:25 ` Jens Axboe
2021-08-13 9:32 ` Dmitry Kadashev
2021-08-13 14:12 ` Jens Axboe
2021-08-16 10:24 ` Dmitry Kadashev
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 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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