namei: ignore ERR/NULL names in putname()
authorDmitry Kadashev <dkadashev@gmail.com>
Thu, 8 Jul 2021 06:34:37 +0000 (13:34 +0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 23 Aug 2021 19:41:26 +0000 (13:41 -0600)
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 <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/io-uring/CAHk-=wgCac9hBsYzKMpHk0EbLgQaXR=OUAjHaBtaY+G8A9KhFg@mail.gmail.com/
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Dmitry Kadashev <dkadashev@gmail.com>
Link: https://lore.kernel.org/r/20210708063447.3556403-2-dkadashev@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/namei.c

index bf6d8a7..dc36bda 100644 (file)
@@ -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)
@@ -4728,11 +4731,9 @@ exit1:
                goto retry;
        }
 put_both:
-       if (!IS_ERR(from))
-               putname(from);
+       putname(from);
 put_new:
-       if (!IS_ERR(to))
-               putname(to);
+       putname(to);
        return error;
 }