LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Richard Weinberger <richard@nod.at>
To: user-mode-linux-devel@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org, richard@nod.at
Subject: [PATCH 08/15] hostfs: Use __getname() in follow_link
Date: Mon, 16 Mar 2015 12:41:12 +0100	[thread overview]
Message-ID: <1426506079-26183-9-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1426506079-26183-1-git-send-email-richard@nod.at>

Be consistent with all other functions in hostfs and just
use __getname().

Signed-off-by: Richard Weinberger <richard@nod.at>
---
 fs/hostfs/hostfs_kern.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index 7260f16..c60d886 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -142,21 +142,19 @@ static char *follow_link(char *link)
 	int len, n;
 	char *name, *resolved, *end;
 
-	len = 64;
-	while (1) {
+	name = __getname();
+	if (!name) {
 		n = -ENOMEM;
-		name = kmalloc(len, GFP_KERNEL);
-		if (name == NULL)
-			goto out;
-
-		n = hostfs_do_readlink(link, name, len);
-		if (n < len)
-			break;
-		len *= 2;
-		kfree(name);
+		goto out_free;
 	}
+
+	n = hostfs_do_readlink(link, name, PATH_MAX);
 	if (n < 0)
 		goto out_free;
+	else if (n == PATH_MAX) {
+		n = -E2BIG;
+		goto out_free;
+	}
 
 	if (*name == '/')
 		return name;
@@ -175,13 +173,12 @@ static char *follow_link(char *link)
 	}
 
 	sprintf(resolved, "%s%s", link, name);
-	kfree(name);
+	__putname(name);
 	kfree(link);
 	return resolved;
 
  out_free:
-	kfree(name);
- out:
+	__putname(name);
 	return ERR_PTR(n);
 }
 
-- 
2.3.2


  parent reply	other threads:[~2015-03-16 11:45 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-16 11:41 Hostfs updates Richard Weinberger
2015-03-16 11:41 ` [PATCH 01/15] hostfs: hostfs_file_open: Switch to data locking model Richard Weinberger
2015-03-16 11:41 ` [PATCH 02/15] hostfs: hostfs_file_open: Fix a fd leak in hostfs_file_open Richard Weinberger
2015-03-16 11:41 ` [PATCH 03/15] hostfs: Allow fsync on directories Richard Weinberger
2015-03-16 11:41 ` [PATCH 04/15] hostfs: Handle bogus st.mode Richard Weinberger
2015-03-16 11:41 ` [PATCH 05/15] hostfs: Make hostfs_readpage more readable Richard Weinberger
2015-03-16 11:41 ` [PATCH 06/15] hostfs: Add a BUG_ON to detect behavior changes of dentry_path_raw() Richard Weinberger
2015-03-16 11:41 ` [PATCH 07/15] hostfs: Remove open coded strcpy() Richard Weinberger
2015-03-16 12:03   ` [uml-devel] " Geert Uytterhoeven
2015-03-16 12:18     ` Richard Weinberger
2015-03-16 12:44       ` Geert Uytterhoeven
2015-03-16 11:41 ` Richard Weinberger [this message]
2015-03-16 11:41 ` [PATCH 09/15] hostfs: Report append flag in ->show_options() Richard Weinberger
2015-03-16 11:41 ` [PATCH 10/15] hostfs: Remove superfluous test in hostfs_open() Richard Weinberger
2015-03-16 11:41 ` [PATCH 11/15] hostfs: hostfs_open: Reset open flags upon each retry Richard Weinberger
2015-03-16 11:41 ` [PATCH 12/15] hostfs: Remove superfluous initializations in hostfs_open() Richard Weinberger
2015-03-16 11:41 ` [PATCH 13/15] hostfs: Set page flags in hostfs_readpage() correctly Richard Weinberger
2015-03-16 11:41 ` [PATCH 14/15] hostfs: Use page_offset() Richard Weinberger
2015-03-16 11:41 ` [PATCH 15/15] hostfs: No need to box and later unbox the file mode Richard Weinberger

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=1426506079-26183-9-git-send-email-richard@nod.at \
    --to=richard@nod.at \
    --cc=linux-kernel@vger.kernel.org \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    --subject='Re: [PATCH 08/15] hostfs: Use __getname() in follow_link' \
    /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

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).